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 27 matching lines @@
   ZoomLevelVector GetAllZoomLevels() const override;
   void SetZoomLevelForHost(const std::string& host, double level) override;
   void SetZoomLevelForHostAndScheme(const std::string& scheme,
                                     const std::string& host,
                                     double level) override;
   bool UsesTemporaryZoomLevel(int render_process_id,
                               int render_view_id) const override;
   void SetTemporaryZoomLevel(int render_process_id,
                              int render_view_id,
                              double level) override;
+  double GetTemporaryZoomLevel(int render_process_id,
+                               int render_view_id) const override;
 
   void ClearTemporaryZoomLevel(int render_process_id,
                                int render_view_id) override;
   double GetDefaultZoomLevel() const override;
   void SetDefaultZoomLevel(double level) override;
   scoped_ptr<Subscription> AddZoomLevelChangedCallback(
       const ZoomLevelChangedCallback& callback) override;
 
   // Returns the current zoom level for the specified WebContents. This may
   // be a temporary zoom level, depending on UsesTemporaryZoomLevel().
   double GetZoomLevelForWebContents(
       const WebContentsImpl& web_contents_impl) const;
 
   // Sets the zoom level for this WebContents. If this WebContents is using
   // a temporary zoom level, then level is only applied to this WebContents.
   // Otherwise, the level will be applied on a host level.
   void SetZoomLevelForWebContents(const WebContentsImpl& web_contents_impl,
                                   double level);
 
   // Sets the zoom level for the specified view. The level may be set for only
   // this view, or for the host, depending on UsesTemporaryZoomLevel().
   void SetZoomLevelForView(int render_process_id,
                            int render_view_id,
                            double level,
                            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;
-
   // 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;
@@ skipping 40 matching lines @@
   mutable base::Lock lock_;
 
   NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(HostZoomMapImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_HOST_ZOOM_MAP_IMPL_H_