Add scheme to HostZoomMap

content/public/browser/host_zoom_map.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.
 
 #ifndef CONTENT_PUBLIC_BROWSER_HOST_ZOOM_MAP_H_
 #define CONTENT_PUBLIC_BROWSER_HOST_ZOOM_MAP_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 20 matching lines @@
   virtual void CopyFrom(HostZoomMap* copy) = 0;
 
   // Returns the zoom level for the host or spec for a given url. The zoom
   // level is determined by the host portion of the URL, or (in the absence of
   // a host) the complete spec of the URL. In most cases, there is no custom
   // zoom level, and this returns the user's default zoom level.  Otherwise,
   // returns the saved zoom level, which may be positive (to zoom in) or
   // negative (to zoom out).
   //
   // This may be called on any thread.
-  virtual double GetZoomLevel(const std::string& host) const = 0;
+  virtual double GetZoomLevelForHost(const std::string& host) const = 0;

[sky, 2013/02/12 18:47:15]

How can we can keep this exposed as public? Doing so makes it easy to circumvent
the zoom set for a scheme+host pair. For example, if the zoom is changed for a
particular scheme+host, the callbacks are notified and one of the callbacks ask
for the zoom level for the host they may get the wrong thing. I think you need
to nuke this and make the callbacks get the scheme+host pair that changed.

+
+  // Returns the zoom level for the host or spec for a given url, taking

[sky, 2013/02/12 18:47:15]

Update description for both this and GetZoomLevelForHost. For example, there is
no 'spec' here or above. Similarly there is no url here or above.

+  // |scheme| in account. If there is specific zoom level specified for given
+  // |scheme| and |host| pair, it will be returned. In other cases result is
+  // equivalent to GetZoomLevelForHost(host).
+  //
+  // This may be called on any thread.
+  virtual double GetZoomLevelForHostAndScheme(
+      const std::string& scheme,
+      const std::string& host) const = 0;
 
   // Sets the zoom level for the host or spec for a given url to |level|.  If
   // the level matches the current default zoom level, the host is erased
   // from the saved preferences; otherwise the new value is written out.
   //
   // This should only be called on the UI thread.
-  virtual void SetZoomLevel(const std::string& host, double level) = 0;
+  virtual void SetZoomLevelForHost(const std::string& host, double level) = 0;
+
+  // Sets the zoom level for the |scheme|/|host| pair to |level|.
+  //
+  // This should only be called on the UI thread.
+  virtual void SetZoomLevelForHostAndScheme(const std::string& scheme,
+                                            const std::string& host,
+                                            double level) = 0;
 
   // Get/Set the default zoom level for pages that don't override it.
   virtual double GetDefaultZoomLevel() const = 0;
   virtual void SetDefaultZoomLevel(double level) = 0;;
 
   typedef base::Callback<void(const std::string&)> ZoomLevelChangedCallback;
 
   // Add and remove zoom level changed callbacks.
   virtual void AddZoomLevelChangedCallback(
       const ZoomLevelChangedCallback& callback) = 0;
   virtual void RemoveZoomLevelChangedCallback(
       const ZoomLevelChangedCallback& callback) = 0;
 
  protected:
   virtual ~HostZoomMap() {}
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_HOST_ZOOM_MAP_H_