mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium revision 2b3ae3b8 (#394939)
This commit is contained in:
@@ -11,7 +11,6 @@
|
||||
#include "chrome/common/chrome_utility_messages.h"
|
||||
#include "chrome/utility/utility_message_handler.h"
|
||||
#include "content/public/common/service_registry.h"
|
||||
#include "content/public/utility/utility_thread.h"
|
||||
#include "net/proxy/mojo_proxy_resolver_factory_impl.h"
|
||||
|
||||
#if defined(OS_WIN)
|
||||
@@ -20,10 +19,6 @@
|
||||
|
||||
namespace {
|
||||
|
||||
bool Send(IPC::Message* message) {
|
||||
return content::UtilityThread::Get()->Send(message);
|
||||
}
|
||||
|
||||
void CreateProxyResolverFactory(
|
||||
mojo::InterfaceRequest<net::interfaces::ProxyResolverFactory> request) {
|
||||
// MojoProxyResolverFactoryImpl is strongly bound to the Mojo message pipe it
|
||||
@@ -46,12 +41,7 @@ CefContentUtilityClient::~CefContentUtilityClient() {
|
||||
|
||||
bool CefContentUtilityClient::OnMessageReceived(
|
||||
const IPC::Message& message) {
|
||||
bool handled = true;
|
||||
|
||||
IPC_BEGIN_MESSAGE_MAP(CefContentUtilityClient, message)
|
||||
IPC_MESSAGE_HANDLER(ChromeUtilityMsg_StartupPing, OnStartupPing)
|
||||
IPC_MESSAGE_UNHANDLED(handled = false)
|
||||
IPC_END_MESSAGE_MAP()
|
||||
bool handled = false;
|
||||
|
||||
for (Handlers::iterator it = handlers_.begin();
|
||||
!handled && it != handlers_.end(); ++it) {
|
||||
@@ -66,8 +56,3 @@ void CefContentUtilityClient::RegisterMojoServices(
|
||||
registry->AddService<net::interfaces::ProxyResolverFactory>(
|
||||
base::Bind(CreateProxyResolverFactory));
|
||||
}
|
||||
|
||||
void CefContentUtilityClient::OnStartupPing() {
|
||||
Send(new ChromeUtilityHostMsg_ProcessStarted);
|
||||
// Don't release the process, we assume further messages are on the way.
|
||||
}
|
||||
|
@@ -20,9 +20,6 @@ class CefContentUtilityClient : public content::ContentUtilityClient {
|
||||
void RegisterMojoServices(content::ServiceRegistry* registry) override;
|
||||
|
||||
private:
|
||||
// IPC message handlers.
|
||||
void OnStartupPing();
|
||||
|
||||
typedef ScopedVector<UtilityMessageHandler> Handlers;
|
||||
Handlers handlers_;
|
||||
|
||||
|
Reference in New Issue
Block a user