| Index: chrome/browser/profiles/profile_impl.h
|
| diff --git a/chrome/browser/profiles/profile_impl.h b/chrome/browser/profiles/profile_impl.h
|
| index 6545b385f11f293c7499711c97ca3f284df4832c..2afa3499f23155c264025f300db332b6dd4db2f1 100644
|
| --- a/chrome/browser/profiles/profile_impl.h
|
| +++ b/chrome/browser/profiles/profile_impl.h
|
| @@ -19,6 +19,7 @@
|
| #include "chrome/browser/profiles/profile_impl_io_data.h"
|
| #include "content/public/browser/content_browser_client.h"
|
| #include "content/public/browser/host_zoom_map.h"
|
| +#include "content/public/browser/zoom_level_prefs_store.h"
|
|
|
| class NetPrefObserver;
|
| class PrefService;
|
| @@ -111,6 +112,7 @@ class ProfileImpl : public Profile {
|
| virtual ExtensionSpecialStoragePolicy*
|
| GetExtensionSpecialStoragePolicy() OVERRIDE;
|
| virtual PrefService* GetPrefs() OVERRIDE;
|
| + virtual PrefService* GetZoomLevelPrefs() OVERRIDE;
|
| virtual PrefService* GetOffTheRecordPrefs() OVERRIDE;
|
| virtual net::URLRequestContextGetter*
|
| GetRequestContextForExtensions() OVERRIDE;
|
| @@ -172,12 +174,10 @@ 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();
|
|
|
| - void OnDefaultZoomLevelChanged();
|
| - void OnZoomLevelChanged(
|
| - const content::HostZoomMap::ZoomLevelChange& change);
|
| -
|
| // Does final prefs initialization and calls Init().
|
| void OnPrefsLoaded(bool success);
|
|
|
| @@ -208,7 +208,9 @@ class ProfileImpl : public Profile {
|
| scoped_ptr<domain_reliability::DomainReliabilityMonitor>
|
| CreateDomainReliabilityMonitor(PrefService* local_state);
|
|
|
| - scoped_ptr<content::HostZoomMap::Subscription> zoom_subscription_;
|
| + // TODO(wjmaclean): This is only here temporarily until HostZoomMap moves
|
| + // into StoragePartition, after which it will also move to StoragePartition.
|
| + scoped_ptr<content::ZoomLevelPrefsStore> zoom_level_prefs_store_;
|
| PrefChangeRegistrar pref_change_registrar_;
|
|
|
| base::FilePath path_;
|
|
|