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 |
index ff0eb8499baaeb90bd8cd189d38478d9c7b880eb..da98099bb8df479f5f371157149f0ddf36b738d8 100644 |
--- a/chrome/browser/ui/zoom/chrome_zoom_level_prefs.h |
+++ b/chrome/browser/ui/zoom/chrome_zoom_level_prefs.h |
@@ -15,6 +15,7 @@ |
#include "base/prefs/pref_service.h" |
#include "base/prefs/pref_store.h" |
#include "content/public/browser/host_zoom_map.h" |
+#include "content/public/browser/zoom_level_delegate.h" |
namespace base { |
class DictionaryValue; |
@@ -28,7 +29,7 @@ namespace chrome { |
// 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 { |
+class ChromeZoomLevelPrefs : public content::ZoomLevelDelegate { |
public: |
typedef base::CallbackList<void(void)>::Subscription |
DefaultZoomLevelSubscription; |
@@ -43,10 +44,6 @@ class ChromeZoomLevelPrefs { |
static std::string GetHashForTesting(const base::FilePath& relative_path); |
- virtual void InitPrefsAndCopyToHostZoomMap( |
- const base::FilePath& partition_path, |
- content::HostZoomMap* host_zoom_map); |
- |
void SetDefaultZoomLevelPref(double level); |
double GetDefaultZoomLevelPref() const; |
scoped_ptr<DefaultZoomLevelSubscription> RegisterDefaultZoomLevelCallback( |
@@ -56,6 +53,11 @@ class ChromeZoomLevelPrefs { |
const base::DictionaryValue* host_zoom_dictionary, |
bool sanitize_partition_host_zoom_levels); |
+ // content::ZoomLevelDelegate |
+ void InitPrefsAndCopyToHostZoomMap( |
Fady Samuel
2014/11/03 22:11:11
nit: Call something that doesn't mention Prefs in
wjmaclean
2014/11/04 19:34:25
Done.
|
+ const base::FilePath& partition_path, |
+ content::HostZoomMap* host_zoom_map) override; |
+ |
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 |