Add scheme to HostZoomMap

content/browser/host_zoom_map_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.
 
 #ifndef CONTENT_BROWSER_HOST_ZOOM_MAP_IMPL_H_
 #define CONTENT_BROWSER_HOST_ZOOM_MAP_IMPL_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 13 matching lines @@
 class CONTENT_EXPORT HostZoomMapImpl : public NON_EXPORTED_BASE(HostZoomMap),
                                        public NotificationObserver,
                                        public base::SupportsUserData::Data {
  public:
   HostZoomMapImpl();
   virtual ~HostZoomMapImpl();
 
   // HostZoomMap implementation:
   virtual void CopyFrom(HostZoomMap* copy) OVERRIDE;
   virtual double GetZoomLevel(const std::string& host) const OVERRIDE;
+  virtual double GetZoomLevel(const std::string& scheme,
+                              const std::string& host) const OVERRIDE;
   virtual void SetZoomLevel(const std::string& host, double level) OVERRIDE;
+  virtual void SetZoomLevel(const std::string& scheme,

[sky, 2013/01/17 17:08:01]

Do we really need both of these (same comment for the getter). Wouldn't it be
cleaner to have only one method that takes the scheme and host?

[Denis Kuznetsov (DE-MUC), 2013/01/21 10:49:29]

Actually, the cleanest way to do this is to make HostZoomMap  accept GURL both
for Get and Set zoom levels, and let HostZoomMap to handle zoom-equivalence
classes of URLs (e.g. for http:// and https:// it is the URLs with same domain,
for internal settings pages that is all pages with chrome:// scheme, except for
/login/ and /oobe/ parts, etc).

However, as this is the part of content-api, I've tried to extend API, but leave
it backwards-compatible. 

+                            const std::string& host,
+                            double level) OVERRIDE;
   virtual double GetDefaultZoomLevel() const OVERRIDE;
   virtual void SetDefaultZoomLevel(double level) OVERRIDE;
 
   // Returns the temporary zoom level that's only valid for the lifetime of
   // the given WebContents (i.e. isn't saved and doesn't affect other
   // WebContentses) if it exists, the default zoom level otherwise.
   //
   // This may be called on any thread.
   double GetTemporaryZoomLevel(int render_process_id,
                                int render_view_id) const;
 
   // Sets the temporary zoom level that's only valid for the lifetime of this
   // WebContents.
   //
   // This should only be called on the UI thread.
   void SetTemporaryZoomLevel(int render_process_id,
                              int render_view_id,
                              double level);
 
   // NotificationObserver implementation.
   virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details) OVERRIDE;
 
  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 {
     int render_process_id;
     int render_view_id;
     double zoom_level;
   };
 
   // Don't expect more than a couple of tabs that are using a temporary zoom
   // level, so vector is fine for now.
   std::vector<TemporaryZoomLevel> temporary_zoom_levels_;
 
   // Used around accesses to |host_zoom_levels_|, |default_zoom_level_| and
   // |temporary_zoom_levels_| to guarantee thread safety.
   mutable base::Lock lock_;
 
   NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(HostZoomMapImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_HOST_ZOOM_MAP_IMPL_H_