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

Unified Diff: chrome/browser/profiles/profile.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
« no previous file with comments | « chrome/browser/profiles/profile.h ('k') | chrome/browser/profiles/profile_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/profile.cc
diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
index 39460e59bc79eba9697ea6a8f71854e57a763ae2..57043c75f8e2473a2bd3120b62c04bb01fbce069 100644
--- a/chrome/browser/profiles/profile.cc
+++ b/chrome/browser/profiles/profile.cc
@@ -14,7 +14,7 @@
#include "base/path_service.h"
#include "base/string_util.h"
#include "build/build_config.h"
-#include "chrome/browser/background_contents_service.h"
+#include "chrome/browser/background_contents_service_factory.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/content_settings/host_content_settings_map.h"
#include "chrome/browser/download/download_manager.h"
@@ -166,8 +166,7 @@ class OffTheRecordProfileImpl : public Profile,
BrowserList::AddObserver(this);
- background_contents_service_.reset(
- new BackgroundContentsService(this, CommandLine::ForCurrentProcess()));
+ BackgroundContentsServiceFactory::GetForProfile(this);
DCHECK(real_profile->GetPrefs()->GetBoolean(prefs::kIncognitoEnabled));
@@ -267,10 +266,6 @@ class OffTheRecordProfileImpl : public Profile,
return GetOriginalProfile()->GetExtensionService();
}
- virtual BackgroundContentsService* GetBackgroundContentsService() const {
- return background_contents_service_.get();
- }
-
virtual StatusTray* GetStatusTray() {
return GetOriginalProfile()->GetStatusTray();
}
@@ -726,9 +721,6 @@ class OffTheRecordProfileImpl : public Profile,
FilePath last_selected_directory_;
- // Tracks all BackgroundContents running under this profile.
- scoped_ptr<BackgroundContentsService> background_contents_service_;
-
scoped_refptr<ChromeBlobStorageContext> blob_storage_context_;
// The file_system context for this profile.
« no previous file with comments | « chrome/browser/profiles/profile.h ('k') | chrome/browser/profiles/profile_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698