DevTools: Rename JavaScript console action into Developer Tools.

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

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

8 files changed, 12 insertions, 26 deletions

diff --git a/chrome/app/chrome_dll.rc b/chrome/app/chrome_dll.rc
index f7c7657..42beeba 100644
--- a/chrome/app/chrome_dll.rc
+++ b/chrome/app/chrome_dll.rc
@@ -53,7 +53,7 @@ BEGIN
     VK_BACK,        IDC_FORWARD,                VIRTKEY, SHIFT
     VK_F11,         IDC_FULLSCREEN,             VIRTKEY
     VK_F1,          IDC_HELP_PAGE,              VIRTKEY
-    "J",            IDC_JS_CONSOLE,             VIRTKEY, CONTROL, SHIFT
+    "J",            IDC_DEV_TOOLS,              VIRTKEY, CONTROL, SHIFT
     "N",            IDC_NEW_INCOGNITO_WINDOW,   VIRTKEY, CONTROL, SHIFT
     "T",            IDC_NEW_TAB,                VIRTKEY, CONTROL
     "N",            IDC_NEW_WINDOW,             VIRTKEY, CONTROL
diff --git a/chrome/app/chrome_dll_resource.h b/chrome/app/chrome_dll_resource.h
index 7e49536..1434b53 100644
--- a/chrome/app/chrome_dll_resource.h
+++ b/chrome/app/chrome_dll_resource.h
@@ -157,7 +157,7 @@
 #define IDC_OPEN_FILE                   40000
 #define IDC_CREATE_SHORTCUTS            40001
 #define IDC_DEVELOPER_MENU              40002
-#define IDC_JS_CONSOLE                  40004
+#define IDC_DEV_TOOLS                   40004
 #define IDC_TASK_MANAGER                40005
 #define IDC_SELECT_PROFILE              40006
 #define IDC_NEW_PROFILE                 40007
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index d929b0f..cd60d42 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -626,14 +626,11 @@ each locale. -->
       <message name="IDS_VIEW_SOURCE" desc="The text label of the View Page Source menu item">
         View s&amp;ource
       </message>
-      <message name="IDS_DEBUGGER" desc="The text label of the JavaScript debugger menu item">
-        Debug JavaScript
-      </message>
       <message name="IDS_REPORT_BUG" desc="The text label of the Report Bug menu item">
         &amp;Report bug or broken website...
       </message>
-      <message name="IDS_JS_CONSOLE" desc="The text the menu to show the JS console">
-        &amp;JavaScript console
+      <message name="IDS_DEV_TOOLS" desc="The text label of the Developer Tools menu item">
+        &amp;Developer Tools
       </message>
       <message name="IDS_TASK_MANAGER" desc="The text label of the Task Manager menu item">
         &amp;Task manager
@@ -3739,17 +3736,6 @@ each locale. -->
         Remember my choice for all links of this type.
       </message>
 
-      <!-- Debugger -->
-      <message name="IDS_DEBUGGER_TITLE_BUSY" desc="V8 Debugger title bar displayed when busy (a command is running)">
-        JavaScript Debugger - Busy
-      </message>
-      <message name="IDS_DEBUGGER_TITLE_BREAK" desc="V8 Debugger title bar displayed when ready and stopped at a breakpoint">
-        JavaScript Debugger - Break
-      </message>
-      <message name="IDS_DEBUGGER_TITLE_RUNNING" desc="V8 Debugger title bar displayed when ready and the page is running">
-        JavaScript Debugger - Running
-      </message>
-
       <!-- Shortcut Modifiers -->
       <message name="IDS_CONTROL_MODIFIER" desc="Control key shortcut modifier">
         Ctrl+<ph name="KEY_COMBO_NAME">$1<ex>C</ex></ph>
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 1e9a830..6df7a48 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -1075,7 +1075,7 @@ void Browser::OpenCreateShortcutsDialog() {
 #endif
 }
 
-void Browser::ToggleJavaScriptConsole() {
+void Browser::ToggleDevToolsWindow() {
   UserMetrics::RecordAction(L"ShowJSConsole", profile_);
   DevToolsManager::GetInstance()->ToggleDevToolsWindow(
       GetSelectedTabContents()->render_view_host());
@@ -1358,7 +1358,7 @@ void Browser::ExecuteCommandWithDisposition(
     // Show various bits of UI
     case IDC_OPEN_FILE:             OpenFile();                    break;
     case IDC_CREATE_SHORTCUTS:      OpenCreateShortcutsDialog();   break;
-    case IDC_JS_CONSOLE:            ToggleJavaScriptConsole();     break;
+    case IDC_DEV_TOOLS:             ToggleDevToolsWindow();        break;
     case IDC_TASK_MANAGER:          OpenTaskManager();             break;
     case IDC_SELECT_PROFILE:        OpenSelectProfileDialog();     break;
     case IDC_NEW_PROFILE:           OpenNewProfileDialog();        break;
@@ -2150,7 +2150,7 @@ void Browser::InitCommandState() {
   // Show various bits of UI
   command_updater_.UpdateCommandEnabled(IDC_OPEN_FILE, true);
   command_updater_.UpdateCommandEnabled(IDC_CREATE_SHORTCUTS, false);
-  command_updater_.UpdateCommandEnabled(IDC_JS_CONSOLE, true);
+  command_updater_.UpdateCommandEnabled(IDC_DEV_TOOLS, true);
   command_updater_.UpdateCommandEnabled(IDC_TASK_MANAGER, true);
   command_updater_.UpdateCommandEnabled(IDC_SELECT_PROFILE, true);
   command_updater_.UpdateCommandEnabled(IDC_SHOW_HISTORY, true);
diff --git a/chrome/browser/browser.h b/chrome/browser/browser.h
index 8536718..4c4555d 100644
--- a/chrome/browser/browser.h
+++ b/chrome/browser/browser.h
@@ -353,7 +353,7 @@ class Browser : public TabStripModelDelegate,
   // Show various bits of UI
   void OpenFile();
   void OpenCreateShortcutsDialog();
-  void ToggleJavaScriptConsole();
+  void ToggleDevToolsWindow();
   void OpenTaskManager();
   void OpenSelectProfileDialog();
   void OpenNewProfileDialog();
diff --git a/chrome/browser/gtk/standard_menus.cc b/chrome/browser/gtk/standard_menus.cc
index 6d60c2d..d9636bc 100644
--- a/chrome/browser/gtk/standard_menus.cc
+++ b/chrome/browser/gtk/standard_menus.cc
@@ -29,7 +29,7 @@ struct MenuCreateMaterial zoom_menu_materials[] = {
 struct MenuCreateMaterial developer_menu_materials[] = {
   { MENU_NORMAL, IDC_VIEW_SOURCE, IDS_VIEW_SOURCE, 0, NULL,
     GDK_u, GDK_CONTROL_MASK },
-  { MENU_NORMAL, IDC_JS_CONSOLE, IDS_JS_CONSOLE, 0, NULL,
+  { MENU_NORMAL, IDC_DEV_TOOLS, IDS_DEV_TOOLS, 0, NULL,
     GDK_j, GDK_CONTROL_MASK | GDK_SHIFT_MASK },
   { MENU_NORMAL, IDC_TASK_MANAGER, IDS_TASK_MANAGER, 0, NULL,
     GDK_Escape, GDK_SHIFT_MASK },
diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc
index d690008..74f5a8b 100644
--- a/chrome/browser/views/toolbar_view.cc
+++ b/chrome/browser/views/toolbar_view.cc
@@ -1046,8 +1046,8 @@ void ToolbarView::CreateDevToolsMenuContents() {
   devtools_menu_contents_.reset(new views::SimpleMenuModel(this));
   devtools_menu_contents_->AddItem(IDC_VIEW_SOURCE,
                                    l10n_util::GetString(IDS_VIEW_SOURCE));
-  devtools_menu_contents_->AddItem(IDC_JS_CONSOLE,
-                                   l10n_util::GetString(IDS_JS_CONSOLE));
+  devtools_menu_contents_->AddItem(IDC_DEV_TOOLS,
+                                   l10n_util::GetString(IDS_DEV_TOOLS));
   devtools_menu_contents_->AddItem(IDC_TASK_MANAGER,
                                    l10n_util::GetString(IDS_TASK_MANAGER));
 }
diff --git a/chrome/test/automated_ui_tests/automated_ui_tests.cc b/chrome/test/automated_ui_tests/automated_ui_tests.cc
index 1a1df67..7f66c9e 100644
--- a/chrome/test/automated_ui_tests/automated_ui_tests.cc
+++ b/chrome/test/automated_ui_tests/automated_ui_tests.cc
@@ -424,7 +424,7 @@ bool AutomatedUITest::Home() {
 }
 
 bool AutomatedUITest::JavaScriptConsole() {
-  return RunCommandAsync(IDC_JS_CONSOLE);
+  return RunCommandAsync(IDC_DEV_TOOLS);
 }
 
 bool AutomatedUITest::OpenAboutDialog() {