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

chrome/browser/ui/zoom/chrome_zoom_level_prefs.h

Index: chrome/browser/ui/zoom/chrome_zoom_level_prefs.h
diff --git a/chrome/browser/ui/zoom/chrome_zoom_level_prefs.h b/chrome/browser/ui/zoom/chrome_zoom_level_prefs.h
new file mode 100644
index 0000000000000000000000000000000000000000..0b9d23c9582d6b4f23311fbaf1cc9a3f485ecf94
--- /dev/null
+++ b/chrome/browser/ui/zoom/chrome_zoom_level_prefs.h
@@ -0,0 +1,70 @@
+// Copyright (c) 2014 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.
+
+#ifndef CHROME_BROWSER_UI_ZOOM_CHROME_ZOOM_LEVEL_PREFS_H_
+#define CHROME_BROWSER_UI_ZOOM_CHROME_ZOOM_LEVEL_PREFS_H_
+
+#include "base/callback.h"
+#include "base/files/file_path.h"
+#include "base/macros.h"
+#include "base/memory/ref_counted.h"
+#include "base/observer_list.h"
+#include "base/prefs/json_pref_store.h"
+#include "base/prefs/pref_change_registrar.h"
+#include "base/prefs/pref_service.h"
+#include "base/prefs/pref_store.h"
+#include "content/public/browser/host_zoom_map.h"
+
+namespace chrome {
+
+// A class to manage per-partition default and per-host zoom levels in Chrome's
+// preference system. It implements an interface between the content/ zoom
+// levels in HostZoomMap and Chrome's preference persistence system. All changes
+// to the per-partition default zoom levels from chrome/ flow through this
+// class. Any changes to per-host levels are updated when HostZoomMap calls
+// OnZoomLevelChanged.
+class ChromeZoomLevelPrefs {
+ public:
+  typedef base::CallbackList<void(void)>::Subscription
+      DefaultZoomLevelSubscription;
+
+  // Exposed as static function for testing.
+  static std::string GetHash(const base::FilePath& relative_path);
+
+  // Initialize the pref_service and the profile_path via the constructor,
+  // as these concepts won't be available in the content base class
+  // (to be added later) which will define the InitPrefsAndCopyToHostZoomMap
+  // interface. |pref_service_| must outlive this class.
+  ChromeZoomLevelPrefs(PrefService* pref_service,
+                       const base::FilePath& profile_path);
+  virtual ~ChromeZoomLevelPrefs();
+
+  virtual void InitPrefsAndCopyToHostZoomMap(
+      const base::FilePath& partition_path,
+      content::HostZoomMap* host_zoom_map);
+
+  void SetDefaultZoomLevelPref(double level);
+  double GetDefaultZoomLevelPref() const;
+  scoped_ptr<DefaultZoomLevelSubscription> RegisterDefaultZoomLevelCallback(
+      const base::Closure& callback);
+
+ private:
+  // This is a callback function that receives notifications from HostZoomMap
+  // when per-host zoom levels change. It is used to update the per-host
+  // zoom levels (if any) managed by this class (for its associated  partition).

[battre, 2014/10/08 11:27:10]

nit: 2 spaces

[wjmaclean, 2014/10/10 14:40:29]

Done.

+  void OnZoomLevelChanged(const content::HostZoomMap::ZoomLevelChange& change);
+
+  PrefService* pref_service_;
+  base::FilePath profile_path_;
+  content::HostZoomMap* host_zoom_map_;
+  scoped_ptr<content::HostZoomMap::Subscription> zoom_subscription_;
+  std::string partition_key_;
+  base::CallbackList<void(void)> default_zoom_changed_callbacks_;
+
+  DISALLOW_COPY_AND_ASSIGN(ChromeZoomLevelPrefs);
+};
+
+}  // namespace chrome
+
+#endif  // CHROME_BROWSER_UI_ZOOM_CHROME_ZOOM_LEVEL_PREFS_H_