| Index: chrome/browser/browser_process_impl.cc
|
| diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
|
| index 7f492c575c22e6ae13b52c0ff07ba29c145f9eb6..510127cbf424e86ac9a332953a8cd3fff60b27ea 100644
|
| --- a/chrome/browser/browser_process_impl.cc
|
| +++ b/chrome/browser/browser_process_impl.cc
|
| @@ -34,7 +34,6 @@
|
| #include "chrome/browser/devtools/remote_debugging_server.h"
|
| #include "chrome/browser/download/download_request_limiter.h"
|
| #include "chrome/browser/download/download_status_updater.h"
|
| -#include "chrome/browser/extensions/chrome_extensions_browser_client.h"
|
| #include "chrome/browser/extensions/event_router_forwarder.h"
|
| #include "chrome/browser/extensions/extension_renderer_state.h"
|
| #include "chrome/browser/first_run/upgrade_util.h"
|
| @@ -69,7 +68,6 @@
|
| #include "chrome/common/chrome_constants.h"
|
| #include "chrome/common/chrome_paths.h"
|
| #include "chrome/common/chrome_switches.h"
|
| -#include "chrome/common/extensions/chrome_extensions_client.h"
|
| #include "chrome/common/pref_names.h"
|
| #include "chrome/common/switch_utils.h"
|
| #include "chrome/common/url_constants.h"
|
| @@ -125,6 +123,11 @@
|
| #include "components/policy/core/common/policy_service_stub.h"
|
| #endif // defined(ENABLE_CONFIGURATION_POLICY)
|
|
|
| +#if defined(ENABLE_EXTENSIONS)
|
| +#include "chrome/browser/extensions/chrome_extensions_browser_client.h"
|
| +#include "chrome/common/extensions/chrome_extensions_client.h"
|
| +#endif
|
| +
|
| #if defined(ENABLE_PLUGIN_INSTALLATION)
|
| #include "chrome/browser/plugins/plugins_resource_service.h"
|
| #endif
|
| @@ -189,14 +192,12 @@ BrowserProcessImpl::BrowserProcessImpl(
|
|
|
| #if defined(ENABLE_EXTENSIONS)
|
| apps::AppsClient::Set(ChromeAppsClient::GetInstance());
|
| -#endif
|
| -
|
| - extensions::ExtensionsClient::Set(
|
| - extensions::ChromeExtensionsClient::GetInstance());
|
| -
|
| extensions_browser_client_.reset(
|
| new extensions::ChromeExtensionsBrowserClient);
|
| extensions::ExtensionsBrowserClient::Set(extensions_browser_client_.get());
|
| + extensions::ExtensionsClient::Set(
|
| + extensions::ChromeExtensionsClient::GetInstance());
|
| +#endif
|
|
|
| extension_event_router_forwarder_ = new extensions::EventRouterForwarder;
|
| ExtensionRendererState::GetInstance()->Init();
|
|
|