Make command-zero reset page scale in addition to zoom level

components/ui/zoom/zoom_controller.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 COMPONENTS_UI_ZOOM_ZOOM_CONTROLLER_H_
 #define COMPONENTS_UI_ZOOM_ZOOM_CONTROLLER_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/prefs/pref_member.h"
 #include "content/public/browser/host_zoom_map.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
 
 class ZoomControllerTest;
 
@@ skipping 108 matching lines @@
 
   // Sets the zoom level via HostZoomMap (or stores it locally if in manual zoom
   // mode), and attributes the zoom to |client|. Returns true on success.
   bool SetZoomLevelByClient(
       double zoom_level,
       const scoped_refptr<const ZoomRequestClient>& client);
 
   // Sets the zoom mode, which defines zoom behavior (see enum ZoomMode).
   void SetZoomMode(ZoomMode zoom_mode);
 
+  // Set and query whether or not the page scale factor is one.
+  void SetPageScaleFactorIsOneForTesting(bool is_one);
+  bool PageScaleFactorIsOne() const;
+
   // content::WebContentsObserver overrides:
   void DidNavigateMainFrame(
       const content::LoadCommittedDetails& details,
       const content::FrameNavigateParams& params) override;
   void WebContentsDestroyed() override;
   void RenderFrameHostChanged(content::RenderFrameHost* old_host,
                               content::RenderFrameHost* new_host) override;
 
  protected:
   // Protected for testing.
@@ skipping 35 matching lines @@
   content::HostZoomMap* host_zoom_map_;
 
   scoped_ptr<content::HostZoomMap::Subscription> zoom_subscription_;
 
   DISALLOW_COPY_AND_ASSIGN(ZoomController);
 };
 
 }  // namespace ui_zoom
 
 #endif  // COMPONENTS_UI_ZOOM_ZOOM_CONTROLLER_H_