[DevTools] Issue zoom from DevToolsWindow instead of browser commands.

This helps to avoid confusion when wrench menu zoom affects DevTools instead
of the page.

BUG=343816

Review URL: https://codereview.chromium.org/165213006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251448 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/devtools/devtools_embedder_message_dispatcher.cc

@@ -234,6 +234,15 @@ DevToolsEmbedderMessageDispatcher::DevToolsEmbedderMessageDispatcher(
   RegisterHandler("searchInPath",
       BindToListParser(base::Bind(&Delegate::SearchInPath,
                                   base::Unretained(delegate))));
+  RegisterHandler("zoomIn",
+      BindToListParser(base::Bind(&Delegate::ZoomIn,
+                                  base::Unretained(delegate))));
+  RegisterHandler("zoomOut",
+      BindToListParser(base::Bind(&Delegate::ZoomOut,
+                                  base::Unretained(delegate))));
+  RegisterHandler("resetZoom",
+      BindToListParser(base::Bind(&Delegate::ResetZoom,
+                                  base::Unretained(delegate))));
 }
 
 DevToolsEmbedderMessageDispatcher::~DevToolsEmbedderMessageDispatcher() {}

chrome/browser/devtools/devtools_embedder_message_dispatcher.h

@@ -54,6 +54,9 @@ class DevToolsEmbedderMessageDispatcher {
     virtual void SearchInPath(int request_id,
                               const std::string& file_system_path,
                               const std::string& query) = 0;
+    virtual void ZoomIn() = 0;
+    virtual void ZoomOut() = 0;
+    virtual void ResetZoom() = 0;
   };
 
   explicit DevToolsEmbedderMessageDispatcher(Delegate* delegate);

chrome/browser/devtools/devtools_window.cc

@@ -1227,6 +1227,18 @@ void DevToolsWindow::SearchInPath(int request_id,
                                           file_system_path));
 }
 
+void DevToolsWindow::ZoomIn() {
+  chrome_page_zoom::Zoom(web_contents(), content::PAGE_ZOOM_IN);
+}
+
+void DevToolsWindow::ZoomOut() {
+  chrome_page_zoom::Zoom(web_contents(), content::PAGE_ZOOM_OUT);
+}
+
+void DevToolsWindow::ResetZoom() {
+  chrome_page_zoom::Zoom(web_contents(), content::PAGE_ZOOM_RESET);
+}
+
 void DevToolsWindow::FileSavedAs(const std::string& url) {
   base::StringValue url_value(url);
   CallClientFunction("InspectorFrontendAPI.savedURL", &url_value, NULL, NULL);

chrome/browser/devtools/devtools_window.h

@@ -326,6 +326,9 @@ class DevToolsWindow : private content::NotificationObserver,
   virtual void SearchInPath(int request_id,
                             const std::string& file_system_path,
                             const std::string& query) OVERRIDE;
+  virtual void ZoomIn() OVERRIDE;
+  virtual void ZoomOut() OVERRIDE;
+  virtual void ResetZoom() OVERRIDE;
 
   // DevToolsFileHelper callbacks.
   void FileSavedAs(const std::string& url);

chrome/browser/ui/browser_commands.cc

@@ -878,16 +878,8 @@ void FindInPage(Browser* browser, bool find_next, bool forward_direction) {
 }
 
 void Zoom(Browser* browser, content::PageZoom zoom) {
-  WebContents* contents = browser->tab_strip_model()->GetActiveWebContents();
-  DevToolsWindow* devtools =
-      DevToolsWindow::GetDockedInstanceForInspectedTab(contents);
-  if (devtools && devtools->web_contents()->GetRenderWidgetHostView() &&
-      devtools->web_contents()->GetRenderWidgetHostView()->HasFocus()) {
-    chrome_page_zoom::Zoom(devtools->web_contents(), zoom);
-    return;
-  }
-
-  chrome_page_zoom::Zoom(contents, zoom);
+  chrome_page_zoom::Zoom(browser->tab_strip_model()->GetActiveWebContents(),
+                         zoom);
 }
 
 void FocusToolbar(Browser* browser) {