Add scheme to HostZoomMap

content/browser/host_zoom_map_impl.h

Index: content/browser/host_zoom_map_impl.h
diff --git a/content/browser/host_zoom_map_impl.h b/content/browser/host_zoom_map_impl.h
index 7840188c0d747399cd59fbb42d0871237aafe74f..512d150c754cd22bdd29fd183d423b3bf48aba58 100644
--- a/content/browser/host_zoom_map_impl.h
+++ b/content/browser/host_zoom_map_impl.h
@@ -32,6 +32,11 @@ class CONTENT_EXPORT HostZoomMapImpl : public NON_EXPORTED_BASE(HostZoomMap),
   virtual void CopyFrom(HostZoomMap* copy) OVERRIDE;
   virtual double GetZoomLevel(const std::string& host) const OVERRIDE;
   virtual void SetZoomLevel(const std::string& host, double level) OVERRIDE;
+  virtual double GetZoomLevel(const std::string& scheme,

[Jói, 2013/01/11 17:41:09]

Order these the same as in HostZoomMap.

[Denis Kuznetsov (DE-MUC), 2013/01/17 13:23:47]

Done.

+                              const std::string& host) const OVERRIDE;
+  virtual void SetZoomLevel(const std::string& scheme,
+                            const std::string& host,
+                            double level) OVERRIDE;
   virtual double GetDefaultZoomLevel() const OVERRIDE;
   virtual void SetDefaultZoomLevel(double level) OVERRIDE;
 
@@ -58,9 +63,11 @@ class CONTENT_EXPORT HostZoomMapImpl : public NON_EXPORTED_BASE(HostZoomMap),
 
  private:
   typedef std::map<std::string, double> HostZoomLevels;
+  typedef std::map<std::string, HostZoomLevels> SchemeHostZoomLevels;
 
   // Copy of the pref data, so that we can read it on the IO thread.
   HostZoomLevels host_zoom_levels_;
+  SchemeHostZoomLevels scheme_host_zoom_levels_;
   double default_zoom_level_;
 
   struct TemporaryZoomLevel {
@@ -79,6 +86,10 @@ class CONTENT_EXPORT HostZoomMapImpl : public NON_EXPORTED_BASE(HostZoomMap),
 
   NotificationRegistrar registrar_;
 
+  void CopyHostZoomLevels(const HostZoomLevels &source,

[sky, 2013/01/11 20:33:32]

& close to type, and HostZoomLevels should be a * (from style guide: "while
output and input/output parameters will be non-const pointers").

+                          HostZoomLevels &dest);
+
+

[sky, 2013/01/11 20:33:32]

nit: only one newline here.

[Denis Kuznetsov (DE-MUC), 2013/01/17 13:23:47]

Done.

   DISALLOW_COPY_AND_ASSIGN(HostZoomMapImpl);
 };