Check temporary zoom status when sending zoom level in navigation.

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 61 matching lines @@
                            const std::string& host);
 
   // 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;
 
+  // Returns the zoom level regardless of whether it's temporary, host-keyed or
+  // scheme+host-keyed.
+  //
+  // This may be called on any thread.
+  double GetZoomLevelForView(const GURL& url,
+                             int render_process_id,
+                             int render_view_id) const;
+
   // NotificationObserver implementation.
   void Observe(int type,
                const NotificationSource& source,
                const NotificationDetails& details) override;
 
   void SendErrorPageZoomLevelRefresh();
 
  private:
   typedef std::map<std::string, double> HostZoomLevels;
   typedef std::map<std::string, HostZoomLevels> SchemeHostZoomLevels;
 
   struct RenderViewKey {
     int render_process_id;
     int render_view_id;
     RenderViewKey(int render_process_id, int render_view_id)
         : render_process_id(render_process_id),
           render_view_id(render_view_id) {}
     bool operator<(const RenderViewKey& other) const {
       return render_process_id < other.render_process_id ||
              ((render_process_id == other.render_process_id) &&
               (render_view_id < other.render_view_id));
     }
   };
 
   typedef std::map<RenderViewKey, double> TemporaryZoomLevels;
 
+  // Non-locked version for internal use. This should only be called within
+  // a scope where a lock has been acquired.
+  double GetZoomLevelForHostAndSchemeInternal(const std::string& scheme,

[Charlie Reis, 2015/02/11 20:56:34]

nit: This should be declared in the same order in the .h and .cc file.  Maybe it
makes sense to move this below GetZoomLevelForHost and have the comment apply to
both of the *Internal functions.

[wjmaclean, 2015/02/12 15:59:36]

Done.

+                                              const std::string& host) const;
   double GetZoomLevelForHost(const std::string& host) const;

[Charlie Reis, 2015/02/11 20:56:34]

nit: Put a blank line before this to clarify that the comment doesn't apply to
it.  (Unnecessary if you fix the first comment.)

[wjmaclean, 2015/02/12 15:59:36]

Done.

 
+  // Non-locked version for internal use. This should only be called within
+  // a scope where a lock has been acquired.
+  double GetZoomLevelForHostInternal(const std::string& host) const;
+
   // Notifies the renderers from this browser context to change the zoom level
   // for the specified host and scheme.
   // TODO(wjmaclean) Should we use a GURL here? crbug.com/384486
   void SendZoomLevelChange(const std::string& scheme,
                            const std::string& host,
                            double level);
 
   // Callbacks called when zoom level changes.
   base::CallbackList<void(const ZoomLevelChange&)>
       zoom_level_changed_callbacks_;
@@ skipping 12 matching lines @@
   mutable base::Lock lock_;
 
   NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(HostZoomMapImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_HOST_ZOOM_MAP_IMPL_H_