diff options
| author | thestig <thestig@chromium.org> | 2014-10-20 11:58:02 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-20 18:58:35 +0000 |
| commit | e415584fa49388436406239a9c632961fc664a62 (patch) | |
| tree | e8708984b7fb8bc3a01b1a0b385a39db0bd30c47 /chrome/browser/profiles | |
| parent | 18d0a569464ac036813f190013df52848164e43d (diff) | |
| download | chromium_src-e415584fa49388436406239a9c632961fc664a62.zip chromium_src-e415584fa49388436406239a9c632961fc664a62.tar.gz chromium_src-e415584fa49388436406239a9c632961fc664a62.tar.bz2 | |
Cleanup: Only include background_mode_manager.h when ENABLE_BACKGROUND is defined.
Also move some extension headers to ENABLE_EXTENSIONS sections.
BUG=424746
Review URL: https://codereview.chromium.org/662783002
Cr-Commit-Position: refs/heads/master@{#300306}
Diffstat (limited to 'chrome/browser/profiles')
| -rw-r--r-- | chrome/browser/profiles/profile_impl.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc index 8ddd09e..39835fd 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc @@ -28,7 +28,6 @@ #include "chrome/browser/autocomplete/autocomplete_classifier.h" #include "chrome/browser/autocomplete/shortcuts_backend.h" #include "chrome/browser/background/background_contents_service_factory.h" -#include "chrome/browser/background/background_mode_manager.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" @@ -117,6 +116,10 @@ #include "components/user_manager/user_manager.h" #endif +#if defined(ENABLE_BACKGROUND) +#include "chrome/browser/background/background_mode_manager.h" +#endif + #if defined(ENABLE_CONFIGURATION_POLICY) #include "chrome/browser/policy/schema_registry_service.h" #include "chrome/browser/policy/schema_registry_service_factory.h" @@ -574,6 +577,7 @@ void ProfileImpl::DoFinalInit() { ssl_config_service_manager_.reset( SSLConfigServiceManager::CreateDefaultManager(local_state)); +#if defined(ENABLE_BACKGROUND) // Initialize the BackgroundModeManager - this has to be done here before // InitExtensions() is called because it relies on receiving notifications // when extensions are loaded. BackgroundModeManager is not needed under @@ -588,6 +592,7 @@ void ProfileImpl::DoFinalInit() { if (g_browser_process->background_mode_manager()) g_browser_process->background_mode_manager()->RegisterProfile(this); } +#endif // defined(ENABLE_BACKGROUND) base::FilePath cookie_path = GetPath(); cookie_path = cookie_path.Append(chrome::kCookieFilename); |