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

chrome/browser/browser_commands_unittest.cc

 // 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.
 
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/ui/browser_command_controller.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ skipping 271 matching lines @@
   GURL url("http://www.google.com");
   AddTab(browser(), url);
   content::WebContents* contents1 = tab_strip_model->GetWebContentsAt(0);
 
   // Change the zoom percentage to 100.
   ui_zoom::PageZoom::Zoom(contents1, content::PAGE_ZOOM_RESET);
 
   ZoomController* zoom_controller = ZoomController::FromWebContents(contents1);
   EXPECT_EQ(zoom_controller->GetZoomPercent(), 100.0f);
   EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_PLUS));
-  EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_NORMAL));
+  EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_NORMAL));
   EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_MINUS));
 }
 
 TEST_F(BrowserCommandsTest, OnZoomLevelChanged) {
   TabStripModel* tab_strip_model = browser()->tab_strip_model();
 
   GURL url("http://www.google.com");
   AddTab(browser(), url);
   content::WebContents* contents1 = tab_strip_model->GetWebContentsAt(0);
 
@@ skipping 15 matching lines @@
   GURL url1("http://code.google.com");
 
   // Add First tab.
   AddTab(browser(), url);
   AddTab(browser(), url1);
   content::WebContents* contents1 = tab_strip_model->GetWebContentsAt(0);
 
   ZoomController* zoom_controller = ZoomController::FromWebContents(contents1);
   EXPECT_EQ(zoom_controller->GetZoomPercent(), 100.0f);
   EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_PLUS));
-  EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_NORMAL));
+  EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_NORMAL));
   EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_MINUS));
 
   // Add Second tab.
   content::WebContents* contents2 = tab_strip_model->GetWebContentsAt(1);
 
   tab_strip_model->ActivateTabAt(1, true);
   EXPECT_TRUE(tab_strip_model->IsTabSelected(1));
   ui_zoom::PageZoom::Zoom(contents2, content::PAGE_ZOOM_OUT);
 
   zoom_controller = ZoomController::FromWebContents(contents2);
   EXPECT_EQ(zoom_controller->GetZoomPercent(), 90.0f);
   EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_PLUS));
   EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_NORMAL));
   EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_MINUS));
 }