summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-22 09:41:33 +0000
committerpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-22 09:41:33 +0000
commitc630f16c1db3184ba7fe485f4d96730c425394e2 (patch)
tree1ba928e755a0de6c3fbced28e2b2b87fdd4538b8 /chrome/browser
parent1163ae0ebb052a816429295a092996a4980cdb33 (diff)
downloadchromium_src-c630f16c1db3184ba7fe485f4d96730c425394e2.zip
chromium_src-c630f16c1db3184ba7fe485f4d96730c425394e2.tar.gz
chromium_src-c630f16c1db3184ba7fe485f4d96730c425394e2.tar.bz2
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
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/browser.cc6
-rw-r--r--chrome/browser/browser.h2
-rw-r--r--chrome/browser/gtk/standard_menus.cc2
-rw-r--r--chrome/browser/views/toolbar_view.cc4
4 files changed, 7 insertions, 7 deletions
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));
}