Add "Inspect Element" shortcut to browser tabs.

If the DevTools window is closed, it gets opened, and the Inspect Element tool is enabled. If the DevTools window is opened, the inspected tab remains focused with the Inspect Element tool enabled.
If the Inspect Element tool is enabled, it gets turned off.

The shortcut is Ctrl-Shift-C for Win/Linux, Cmd-Shift-C for Mac

BUG=29532
TEST=manual

Review URL: http://codereview.chromium.org/3011002

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

1 files changed, 15 insertions, 9 deletions

diff --git a/chrome/browser/debugger/devtools_manager.cc b/chrome/browser/debugger/devtools_manager.cc
index 2965478..6b958cc 100644
--- a/chrome/browser/debugger/devtools_manager.cc
+++ b/chrome/browser/debugger/devtools_manager.cc
@@ -131,12 +131,16 @@ void DevToolsManager::RequestUndockWindow(RenderViewHost* client_rvh) {
 }
 
 void DevToolsManager::OpenDevToolsWindow(RenderViewHost* inspected_rvh) {
-  ToggleDevToolsWindow(inspected_rvh, true, false);
+  ToggleDevToolsWindow(
+      inspected_rvh,
+      true,
+      DEVTOOLS_TOGGLE_ACTION_NONE);
 }
 
-void DevToolsManager::ToggleDevToolsWindow(RenderViewHost* inspected_rvh,
-                                           bool open_console) {
-  ToggleDevToolsWindow(inspected_rvh, false, open_console);
+void DevToolsManager::ToggleDevToolsWindow(
+    RenderViewHost* inspected_rvh,
+    DevToolsToggleAction action) {
+  ToggleDevToolsWindow(inspected_rvh, false, action);
 }
 
 void DevToolsManager::RuntimeFeatureStateChanged(RenderViewHost* inspected_rvh,
@@ -345,9 +349,10 @@ void DevToolsManager::ReopenWindow(RenderViewHost* client_rvh, bool docked) {
   window->SetDocked(docked);
 }
 
-void DevToolsManager::ToggleDevToolsWindow(RenderViewHost* inspected_rvh,
-                                           bool force_open,
-                                           bool open_console) {
+void DevToolsManager::ToggleDevToolsWindow(
+    RenderViewHost* inspected_rvh,
+    bool force_open,
+    DevToolsToggleAction action) {
   bool do_open = force_open;
   DevToolsClientHost* host = GetDevToolsClientHostFor(inspected_rvh);
   if (!host) {
@@ -368,9 +373,10 @@ void DevToolsManager::ToggleDevToolsWindow(RenderViewHost* inspected_rvh,
   // undocked, we show (activate) it.
   if (!window->is_docked() || do_open) {
     AutoReset<bool> auto_reset_in_initial_show(&in_initial_show_, true);
-    window->Show(open_console);
-  } else
+    window->Show(action);
+  } else {
     UnregisterDevToolsClientHostFor(inspected_rvh);
+  }
 }
 
 void DevToolsManager::BindClientHost(RenderViewHost* inspected_rvh,