Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(81)

Unified Diff: chrome/browser/profiles/profile_impl.cc

Issue 6831016: Profile shouldn't own background page stuff. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/profiles/profile_impl.cc
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index 4a71f99dda1f9122124bed8aee9cc4e084b17b19..b69e1da9559a3eb926767d2e301157ebbcad4a7f 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -16,8 +16,8 @@
#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.h"
-#include "chrome/browser/background_mode_manager.h"
+#include "chrome/browser/background_contents_service_factory.h"
+#include "chrome/browser/background_mode_manager_factory.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_signin.h"
@@ -297,12 +297,10 @@ ProfileImpl::ProfileImpl(const FilePath& path)
// ChromeOS because Chrome is always running (no need for special keep-alive
// or launch-on-startup support).
#if !defined(OS_CHROMEOS)
- background_mode_manager_.reset(new BackgroundModeManager(this,
- CommandLine::ForCurrentProcess()));
+ BackgroundModeManagerFactory::GetForProfile(this);
#endif
- background_contents_service_.reset(
- new BackgroundContentsService(this, CommandLine::ForCurrentProcess()));
+ BackgroundContentsServiceFactory::GetForProfile(this);
extension_info_map_ = new ExtensionInfoMap();
@@ -683,10 +681,6 @@ ExtensionService* ProfileImpl::GetExtensionService() {
return extensions_service_.get();
}
-BackgroundContentsService* ProfileImpl::GetBackgroundContentsService() const {
- return background_contents_service_.get();
-}
-
StatusTray* ProfileImpl::GetStatusTray() {
if (!status_tray_.get())
status_tray_.reset(StatusTray::Create());
« no previous file with comments | « chrome/browser/profiles/profile_impl.h ('k') | chrome/browser/tab_contents/render_view_host_delegate_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698