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

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

Issue 393133002: Migrate HostZoomMap to live in StoragePartition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments; patch for landing. Created 6 years, 1 month 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.cc ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/profile_impl.h
diff --git a/chrome/browser/profiles/profile_impl.h b/chrome/browser/profiles/profile_impl.h
index 2ff686ee1586b9cd392c7c15863645a34f20f5a1..eca569eaf31c4b68cc7b2046f922fe53c5881aeb 100644
--- a/chrome/browser/profiles/profile_impl.h
+++ b/chrome/browser/profiles/profile_impl.h
@@ -76,6 +76,8 @@ class ProfileImpl : public Profile {
static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
// content::BrowserContext implementation:
+ scoped_ptr<content::ZoomLevelDelegate> CreateZoomLevelDelegate(
+ const base::FilePath& partition_path) override;
base::FilePath GetPath() const override;
content::DownloadManagerDelegate* GetDownloadManagerDelegate() override;
net::URLRequestContextGetter* GetRequestContext() override;
@@ -169,10 +171,6 @@ class ProfileImpl : public Profile {
// Does final initialization. Should be called after prefs were loaded.
void DoFinalInit();
- // TODO(wjmaclean): Delete this once the HostZoomMap moves to
- // StoragePartition.
- void InitHostZoomMap();
-
// Does final prefs initialization and calls Init().
void OnPrefsLoaded(bool success);
@@ -235,10 +233,6 @@ class ProfileImpl : public Profile {
scoped_refptr<user_prefs::PrefRegistrySyncable> pref_registry_;
scoped_ptr<PrefServiceSyncable> prefs_;
scoped_ptr<PrefServiceSyncable> otr_prefs_;
- // TODO(wjmaclean): This is only here temporarily until HostZoomMap moves
- // into StoragePartition, after which it will also move to StoragePartition.
- // Must declare this here so it is destroyed before the profile prefs service.
- scoped_ptr<chrome::ChromeZoomLevelPrefs> zoom_level_prefs_;
ProfileImplIOData::Handle io_data_;
#if defined(ENABLE_EXTENSIONS)
scoped_refptr<ExtensionSpecialStoragePolicy>
« no previous file with comments | « chrome/browser/profiles/profile.cc ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698