Modifying the BackgroundModeManager to handle multiple profiles.

chrome/browser/profiles/profile_impl.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/profiles/profile_impl.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/environment.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
 #include "chrome/browser/background_contents_service_factory.h"
-#include "chrome/browser/background_mode_manager_factory.h"
+#include "chrome/browser/background_mode_manager.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_signin.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/extensions/extension_devtools_manager.h"
 #include "chrome/browser/extensions/extension_error_reporter.h"
 #include "chrome/browser/extensions/extension_event_router.h"
@@ skipping 24 matching lines @@
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/search_engines/template_url_fetcher.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/spellcheck_host.h"
 #include "chrome/browser/ssl/ssl_host_state.h"
-#include "chrome/browser/status_icons/status_tray.h"
 #include "chrome/browser/sync/profile_sync_factory_impl.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/tabs/pinned_tab_service_factory.h"
 #include "chrome/browser/transport_security_persister.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/find_bar/find_bar_state.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/ui/webui/extension_icon_source.h"
 #include "chrome/browser/ui/webui/ntp/ntp_resource_cache.h"
 #include "chrome/browser/user_style_sheet_watcher.h"
@@ skipping 280 matching lines @@
       SSLConfigServiceManager::CreateDefaultManager(local_state));
 
   PinnedTabServiceFactory::GetForProfile(this);
 
   // 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
   // ChromeOS because Chrome is always running (no need for special keep-alive
   // or launch-on-startup support).
 #if !defined(OS_CHROMEOS)
-  BackgroundModeManagerFactory::GetForProfile(this);
+  if (g_browser_process->background_mode_manager())
+    g_browser_process->background_mode_manager()->RegisterProfile(this);
 #endif
 
   BackgroundContentsServiceFactory::GetForProfile(this);
 
   extension_info_map_ = new ExtensionInfoMap();
 
   InitRegisteredProtocolHandlers();
 
   clear_local_state_on_exit_ = prefs->GetBoolean(prefs::kClearSiteDataOnExit);
   if (clear_local_state_on_exit_) {
@@ skipping 364 matching lines @@
     visited_link_master_.swap(visited_links);
   }
 
   return visited_link_master_.get();
 }
 
 ExtensionService* ProfileImpl::GetExtensionService() {
   return extension_service_.get();
 }
 
-StatusTray* ProfileImpl::GetStatusTray() {
-  if (!status_tray_.get())
-    status_tray_.reset(StatusTray::Create());
-  return status_tray_.get();
-}
-
 UserScriptMaster* ProfileImpl::GetUserScriptMaster() {
   return user_script_master_.get();
 }
 
 ExtensionDevToolsManager* ProfileImpl::GetExtensionDevToolsManager() {
   return extension_devtools_manager_.get();
 }
 
 ExtensionProcessManager* ProfileImpl::GetExtensionProcessManager() {
   return extension_process_manager_.get();
@@ skipping 875 matching lines @@
   return pref_proxy_config_tracker_;
 }
 
 prerender::PrerenderManager* ProfileImpl::GetPrerenderManager() {
   if (!prerender::PrerenderManager::IsPrerenderingPossible())
     return NULL;
   if (!prerender_manager_.get())
     prerender_manager_.reset(new prerender::PrerenderManager(this));
   return prerender_manager_.get();
 }