Introduce ChromeZoomLevelPref, make zoom level prefs independent of profile prefs.

chrome/browser/profiles/profile_impl.h

 // Copyright (c) 2012 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.
 
 // This class gathers state related to a single user profile.
 
 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IMPL_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_IMPL_H_
 
 #include <string>
 
 #include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_change_registrar.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_impl_io_data.h"
+#include "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/host_zoom_map.h"
 
 class NetPrefObserver;
 class PrefService;
 class PrefServiceSyncable;
 class ShortcutsBackend;
 class SSLConfigServiceManager;
 class TrackedPreferenceValidationDelegate;
 
@@ skipping 74 matching lines @@
   virtual Profile* GetOffTheRecordProfile() override;
   virtual void DestroyOffTheRecordProfile() override;
   virtual bool HasOffTheRecordProfile() override;
   virtual Profile* GetOriginalProfile() override;
   virtual bool IsSupervised() override;
   virtual history::TopSites* GetTopSites() override;
   virtual history::TopSites* GetTopSitesWithoutCreating() override;
   virtual ExtensionSpecialStoragePolicy*
       GetExtensionSpecialStoragePolicy() override;
   virtual PrefService* GetPrefs() override;
+  virtual chrome::ChromeZoomLevelPrefs* GetZoomLevelPrefs() override;
   virtual PrefService* GetOffTheRecordPrefs() override;
   virtual net::URLRequestContextGetter*
       GetRequestContextForExtensions() override;
   virtual net::SSLConfigService* GetSSLConfigService() override;
   virtual HostContentSettingsMap* GetHostContentSettingsMap() override;
   virtual bool IsSameProfile(Profile* profile) override;
   virtual base::Time GetStartTime() const override;
   virtual net::URLRequestContextGetter* CreateRequestContext(
       content::ProtocolHandlerMap* protocol_handlers,
       content::URLRequestInterceptorScopedVector request_interceptors) override;
@@ skipping 41 matching lines @@
   static int create_readme_delay_ms;
 
   ProfileImpl(const base::FilePath& path,
               Delegate* delegate,
               CreateMode create_mode,
               base::SequencedTaskRunner* sequenced_task_runner);
 
   // 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);
 
 #if defined(ENABLE_SESSION_SERVICE)
   void StopCreateSessionServiceTimer();
 
   void EnsureSessionServiceCreated();
 #endif
 
 
@@ skipping 10 matching lines @@
 
   void GetCacheParameters(bool is_media_context,
                           base::FilePath* cache_path,
                           int* max_size);
 
   PrefProxyConfigTracker* CreateProxyConfigTracker();
 
   scoped_ptr<domain_reliability::DomainReliabilityMonitor>
       CreateDomainReliabilityMonitor(PrefService* local_state);
 
-  scoped_ptr<content::HostZoomMap::Subscription> zoom_subscription_;
   PrefChangeRegistrar pref_change_registrar_;
 
   base::FilePath path_;
   base::FilePath base_cache_path_;
 
   // !!! BIG HONKING WARNING !!!
   //  The order of the members below is important. Do not change it unless
   //  you know what you're doing. Also, if adding a new member here make sure
   //  that the declaration occurs AFTER things it depends on as destruction
   //  happens in reverse order of declaration.
@@ skipping 12 matching lines @@
   // Keep |pref_validation_delegate_| above |prefs_| so that the former outlives
   // the latter.
   scoped_ptr<TrackedPreferenceValidationDelegate> pref_validation_delegate_;
 
   // Keep |prefs_| on top for destruction order because |extension_prefs_|,
   // |net_pref_observer_|, |io_data_| and others store pointers to |prefs_| and
   // shall be destructed first.
   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>
       extension_special_storage_policy_;
 #endif
   scoped_ptr<NetPrefObserver> net_pref_observer_;
   scoped_ptr<SSLConfigServiceManager> ssl_config_service_manager_;
   scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
   scoped_refptr<ShortcutsBackend> shortcuts_backend_;
 
@@ skipping 37 matching lines @@
   // components/keyed_service/content/browser_context_keyed_service_factory.*
 
   Profile::Delegate* delegate_;
 
   chrome_browser_net::Predictor* predictor_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileImpl);
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_IMPL_H_