Cleanup, part 1.

* Consistently use underscores between words in identifiers (IDC_NEWTAB -> IDC_NEW_TAB)
* Make some identifiers clearer or more up-to-date (IDC_DUPLICATE -> IDC_DUPLICATE_TAB, IDC_GOOFFTHERECORD -> IDC_NEW_INCOGNITO_WINDOW, IDC_NEWPROFILEWINDOW -> IDC_PROFILE_MENU)
* Try and make string identifiers (IDS_xxx) match their corresponding IDC_xxx commands.  Tony tells me this will not cause any need for retranslation.
* As much as possible (without modifying automated UI test XML files), use "Bookmark Bar", not "Bookmarks Bar" (this seemed to be prevailing usage in the code)
* Fix 80-column issues

This patch touches move files than any subsequent patches, but should be the most rubber-stampable.

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

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

14 files changed, 167 insertions, 169 deletions

diff --git a/chrome/browser/autocomplete/autocomplete_edit.cc b/chrome/browser/autocomplete/autocomplete_edit.cc
index 60f1387..357fbd9 100644
--- a/chrome/browser/autocomplete/autocomplete_edit.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit.cc
@@ -756,8 +756,8 @@ AutocompleteEditView::AutocompleteEditView(
     context_menu_->AppendMenuItemWithLabel(
         IDS_PASTE_AND_GO, l10n_util::GetString(IDS_PASTE_AND_GO));
     context_menu_->AppendSeparator();
-    context_menu_->AppendMenuItemWithLabel(IDS_SELECTALL,
-                                           l10n_util::GetString(IDS_SELECTALL));
+    context_menu_->AppendMenuItemWithLabel(
+        IDS_SELECT_ALL, l10n_util::GetString(IDS_SELECT_ALL));
     context_menu_->AppendSeparator();
     context_menu_->AppendMenuItemWithLabel(
         IDS_EDIT_SEARCH_ENGINES, l10n_util::GetString(IDS_EDIT_SEARCH_ENGINES));
@@ -1174,7 +1174,7 @@ bool AutocompleteEditView::IsCommandEnabled(int id) const {
     case IDS_COPY:         return !!CanCopy();
     case IDS_PASTE:        return !!CanPaste();
     case IDS_PASTE_AND_GO: return CanPasteAndGo(GetClipboardText());
-    case IDS_SELECTALL:    return !!CanSelectAll();
+    case IDS_SELECT_ALL:   return !!CanSelectAll();
     case IDS_EDIT_SEARCH_ENGINES:
       return command_controller_->IsCommandEnabled(IDC_EDIT_SEARCH_ENGINES);
     default:               NOTREACHED(); return false;
@@ -1219,7 +1219,7 @@ void AutocompleteEditView::ExecuteCommand(int id) {
       Paste();
       break;
 
-    case IDS_SELECTALL:
+    case IDS_SELECT_ALL:
       SelectAll(false);
       break;
 
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index c1d4a15..2f2b6b5 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -2238,7 +2238,7 @@ void AutomationProvider::SavePage(const IPC::Message& message,
   NavigationController* nav = tab_tracker_->GetResource(tab_handle);
   Browser* browser = FindAndActivateTab(nav);
   DCHECK(browser);
-  if (!browser->IsCommandEnabled(IDC_SAVEPAGE)) {
+  if (!browser->IsCommandEnabled(IDC_SAVE_PAGE)) {
     Send(new AutomationMsg_SavePageResponse(message.routing_id(), false));
     return;
   }
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 4d96433..dba2bc0 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -1036,12 +1036,12 @@ void Browser::ShowDownloadsTab() {
   ShowNativeUITab(DownloadTabUI::GetURL());
 }
 
-void Browser::OpenBookmarksManager() {
+void Browser::OpenBookmarkManager() {
   UserMetrics::RecordAction(L"ShowBookmarkManager", profile_);
   window_->ShowBookmarkManager();
 }
 
-void Browser::ToggleBookmarksBar() {
+void Browser::ToggleBookmarkBar() {
   UserMetrics::RecordAction(L"ShowBookmarksBar", profile_);
   window_->ToggleBookmarkBar();
 }
@@ -1105,16 +1105,16 @@ void Browser::ExecuteCommand(int id) {
     case IDC_STOP: Stop(); break;
     case IDC_HOME: Home(); break;
     case IDC_GO: Go(); break;
-    case IDC_OPENURL: OpenCurrentURL(); break;
+    case IDC_OPEN_CURRENT_URL: OpenCurrentURL(); break;
 
-    case IDC_NEWTAB: NewTab(); break;
-    case IDC_CLOSETAB: CloseTab(); break;
+    case IDC_NEW_TAB: NewTab(); break;
+    case IDC_CLOSE_TAB: CloseTab(); break;
     case IDC_CLOSE_WEB_APP: CloseApp(); break;
-    case IDC_NEWWINDOW: NewWindow(); break;
-    case IDC_GOOFFTHERECORD: NewIncognitoWindow(); break;
-    case IDC_CLOSEWINDOW: CloseWindow(); break;
+    case IDC_NEW_WINDOW: NewWindow(); break;
+    case IDC_NEW_INCOGNITO_WINDOW: NewIncognitoWindow(); break;
+    case IDC_CLOSE_WINDOW: CloseWindow(); break;
     case IDC_SELECT_NEXT_TAB: SelectNextTab(); break;
-    case IDC_SELECT_PREV_TAB: SelectPreviousTab(); break;
+    case IDC_SELECT_PREVIOUS_TAB: SelectPreviousTab(); break;
     case IDC_SELECT_TAB_0:
     case IDC_SELECT_TAB_1:
     case IDC_SELECT_TAB_2:
@@ -1124,7 +1124,7 @@ void Browser::ExecuteCommand(int id) {
     case IDC_SELECT_TAB_6:
     case IDC_SELECT_TAB_7: SelectNumberedTab(id - IDC_SELECT_TAB_0); break;
     case IDC_SELECT_LAST_TAB: SelectLastTab(); break;
-    case IDC_DUPLICATE: DuplicateTab(); break;
+    case IDC_DUPLICATE_TAB: DuplicateTab(); break;
     case IDC_RESTORE_TAB: RestoreTab(); break;
     case IDC_SHOW_AS_TAB: ConvertPopupToTabbedBrowser(); break;
     case IDC_EXIT: Exit(); break;
@@ -1147,10 +1147,10 @@ void Browser::ExecuteCommand(int id) {
     case IDC_FOCUS_TOOLBAR: FocusToolbar(); break;
 
     case IDC_STAR: BookmarkCurrentPage(); break;
-    case IDC_VIEWSOURCE: ViewSource(); break;
-    case IDC_CLOSEPOPUPS: ClosePopups(); break;
+    case IDC_VIEW_SOURCE: ViewSource(); break;
+    case IDC_CLOSE_POPUPS: ClosePopups(); break;
     case IDC_PRINT: Print(); break;
-    case IDC_SAVEPAGE: SavePage(); break;
+    case IDC_SAVE_PAGE: SavePage(); break;
     case IDC_ENCODING_AUTO_DETECT: ToggleEncodingAutoDetect(); break;
     case IDC_ENCODING_UTF8:
     case IDC_ENCODING_UTF16LE:
@@ -1192,21 +1192,21 @@ void Browser::ExecuteCommand(int id) {
     case IDC_EDIT_SEARCH_ENGINES: OpenKeywordEditor(); break;
     case IDC_CLEAR_BROWSING_DATA: OpenClearBrowsingDataDialog(); break;
     case IDC_IMPORT_SETTINGS: OpenImportSettingsDialog(); break;
-    case IDS_COMMANDS_REPORTBUG: OpenBugReportDialog(); break;
+    case IDC_REPORT_BUG: OpenBugReportDialog(); break;
     case IDC_DEBUGGER: OpenDebuggerWindow(); break;
-    case IDC_SHOW_JS_CONSOLE: OpenJavaScriptConsole(); break;
-    case IDC_CREATE_SHORTCUT: OpenCreateShortcutsDialog(); break;
+    case IDC_JS_CONSOLE: OpenJavaScriptConsole(); break;
+    case IDC_CREATE_SHORTCUTS: OpenCreateShortcutsDialog(); break;
     case IDC_VIEW_PASSWORDS: OpenPasswordManager(); break;
     case IDC_ABOUT: OpenAboutChromeDialog(); break;
-    case IDC_OPENFILE: OpenFile(); break;
-    case IDC_TASKMANAGER: OpenTaskManager(); break;
+    case IDC_OPEN_FILE: OpenFile(); break;
+    case IDC_TASK_MANAGER: OpenTaskManager(); break;
     case IDC_OPTIONS: OpenOptionsDialog(); break;
-    case IDC_HELPMENU: OpenHelpTab(); break;
+    case IDC_HELP_PAGE: OpenHelpTab(); break;
     case IDC_SHOW_HISTORY: ShowHistoryTab(); break;
     case IDC_SHOW_DOWNLOADS: ShowDownloadsTab(); break;
-    case IDC_SHOW_BOOKMARK_MANAGER: OpenBookmarksManager(); break;
-    case IDC_SHOW_BOOKMARKS_BAR: ToggleBookmarksBar(); break;
-    case IDC_NEWPROFILEWINDOW:
+    case IDC_SHOW_BOOKMARK_MANAGER: OpenBookmarkManager(); break;
+    case IDC_SHOW_BOOKMARK_BAR: ToggleBookmarkBar(); break;
+    case IDC_PROFILE_MENU:
     case IDC_SELECT_PROFILE:
       OpenSelectProfileDialog();
       break;
@@ -1214,9 +1214,9 @@ void Browser::ExecuteCommand(int id) {
 
     default:
       // Handle the user action for creating a new window in a specific profile.
-      if (id >= IDC_NEWPROFILEWINDOW_MIN_ID &&
-          id <= IDC_NEWPROFILEWINDOW_MAX_ID) {
-        int index = id - IDC_NEWPROFILEWINDOW_MIN_ID;
+      if (id >= IDC_NEW_WINDOW_PROFILE_0 &&
+          id <= IDC_NEW_WINDOW_PROFILE_LAST) {
+        int index = id - IDC_NEW_WINDOW_PROFILE_0;
         NewProfileWindowByIndex(index);
       } else {
         LOG(WARNING) << "Received Unimplemented Command: " << id;
@@ -1881,15 +1881,15 @@ void Browser::InitCommandState() {
   controller_.UpdateCommandEnabled(IDC_RELOAD, true);
   controller_.UpdateCommandEnabled(IDC_HOME, type() == TYPE_NORMAL);
   controller_.UpdateCommandEnabled(IDC_GO, true);
-  controller_.UpdateCommandEnabled(IDC_NEWTAB, true);
-  controller_.UpdateCommandEnabled(IDC_CLOSETAB, true);
-  controller_.UpdateCommandEnabled(IDC_NEWWINDOW, true);
-  controller_.UpdateCommandEnabled(IDC_CLOSEWINDOW, true);
+  controller_.UpdateCommandEnabled(IDC_NEW_TAB, true);
+  controller_.UpdateCommandEnabled(IDC_CLOSE_TAB, true);
+  controller_.UpdateCommandEnabled(IDC_NEW_WINDOW, true);
+  controller_.UpdateCommandEnabled(IDC_CLOSE_WINDOW, true);
   controller_.UpdateCommandEnabled(IDC_FOCUS_LOCATION, true);
   controller_.UpdateCommandEnabled(IDC_FOCUS_SEARCH, true);
   controller_.UpdateCommandEnabled(IDC_FOCUS_TOOLBAR, true);
   controller_.UpdateCommandEnabled(IDC_STAR, true);
-  controller_.UpdateCommandEnabled(IDC_OPENURL, true);
+  controller_.UpdateCommandEnabled(IDC_OPEN_CURRENT_URL, true);
   controller_.UpdateCommandEnabled(IDC_SHOWALLTABS_NEXT, true);
   controller_.UpdateCommandEnabled(IDC_SHOWALLTABS_PREV, true);
   controller_.UpdateCommandEnabled(IDC_SHOWALLTABS, true);
@@ -1899,10 +1899,10 @@ void Browser::InitCommandState() {
   controller_.UpdateCommandEnabled(IDC_FIND, true);
   controller_.UpdateCommandEnabled(IDC_FIND_NEXT, true);
   controller_.UpdateCommandEnabled(IDC_FIND_PREVIOUS, true);
-  controller_.UpdateCommandEnabled(IDS_COMMANDS_REPORTBUG, true);
-  controller_.UpdateCommandEnabled(IDC_SHOW_JS_CONSOLE, true);
+  controller_.UpdateCommandEnabled(IDC_REPORT_BUG, true);
+  controller_.UpdateCommandEnabled(IDC_JS_CONSOLE, true);
   controller_.UpdateCommandEnabled(IDC_SELECT_NEXT_TAB, true);
-  controller_.UpdateCommandEnabled(IDC_SELECT_PREV_TAB, true);
+  controller_.UpdateCommandEnabled(IDC_SELECT_PREVIOUS_TAB, true);
   controller_.UpdateCommandEnabled(IDC_SELECT_TAB_0, true);
   controller_.UpdateCommandEnabled(IDC_SELECT_TAB_1, true);
   controller_.UpdateCommandEnabled(IDC_SELECT_TAB_2, true);
@@ -1912,28 +1912,28 @@ void Browser::InitCommandState() {
   controller_.UpdateCommandEnabled(IDC_SELECT_TAB_6, true);
   controller_.UpdateCommandEnabled(IDC_SELECT_TAB_7, true);
   controller_.UpdateCommandEnabled(IDC_SELECT_LAST_TAB, true);
-  controller_.UpdateCommandEnabled(IDC_VIEWSOURCE, true);
-  controller_.UpdateCommandEnabled(IDC_CREATE_SHORTCUT, false);
+  controller_.UpdateCommandEnabled(IDC_VIEW_SOURCE, true);
+  controller_.UpdateCommandEnabled(IDC_CREATE_SHORTCUTS, false);
   controller_.UpdateCommandEnabled(IDC_EDIT_SEARCH_ENGINES, true);
   controller_.UpdateCommandEnabled(IDC_ZOOM_PLUS, true);
   controller_.UpdateCommandEnabled(IDC_ZOOM_MINUS, true);
   controller_.UpdateCommandEnabled(IDC_ZOOM_NORMAL, true);
-  controller_.UpdateCommandEnabled(IDC_OPENFILE, true);
-  controller_.UpdateCommandEnabled(IDC_TASKMANAGER, true);
-  controller_.UpdateCommandEnabled(IDC_CLOSEPOPUPS, true);
+  controller_.UpdateCommandEnabled(IDC_OPEN_FILE, true);
+  controller_.UpdateCommandEnabled(IDC_TASK_MANAGER, true);
+  controller_.UpdateCommandEnabled(IDC_CLOSE_POPUPS, true);
   controller_.UpdateCommandEnabled(IDC_PRINT, true);
   controller_.UpdateCommandEnabled(IDC_COPY_URL, true);
-  controller_.UpdateCommandEnabled(IDC_DUPLICATE, true);
-  controller_.UpdateCommandEnabled(IDC_GOOFFTHERECORD, true);
+  controller_.UpdateCommandEnabled(IDC_DUPLICATE_TAB, true);
+  controller_.UpdateCommandEnabled(IDC_NEW_INCOGNITO_WINDOW, true);
   controller_.UpdateCommandEnabled(IDC_VIEW_PASSWORDS, true);
   controller_.UpdateCommandEnabled(IDC_IMPORT_SETTINGS, true);
   controller_.UpdateCommandEnabled(IDC_CLEAR_BROWSING_DATA, true);
   controller_.UpdateCommandEnabled(IDC_ABOUT, true);
   controller_.UpdateCommandEnabled(IDC_SHOW_HISTORY, true);
-  controller_.UpdateCommandEnabled(IDC_SHOW_BOOKMARKS_BAR, true);
+  controller_.UpdateCommandEnabled(IDC_SHOW_BOOKMARK_BAR, true);
   controller_.UpdateCommandEnabled(IDC_SHOW_BOOKMARK_MANAGER, true);
   controller_.UpdateCommandEnabled(IDC_SHOW_DOWNLOADS, true);
-  controller_.UpdateCommandEnabled(IDC_ENCODING, true);
+  controller_.UpdateCommandEnabled(IDC_ENCODING_MENU, true);
   controller_.UpdateCommandEnabled(IDC_ENCODING_AUTO_DETECT, true);
   controller_.UpdateCommandEnabled(IDC_ENCODING_UTF8, true);
   controller_.UpdateCommandEnabled(IDC_ENCODING_UTF16LE, true);
@@ -1981,8 +1981,8 @@ void Browser::InitCommandState() {
   // the debugger doesn't work in single process mode
   controller_.UpdateCommandEnabled(IDC_DEBUGGER,
       !RenderProcessHost::run_renderer_in_process());
-  controller_.UpdateCommandEnabled(IDC_DEVELOPER, true);
-  controller_.UpdateCommandEnabled(IDC_HELPMENU, true);
+  controller_.UpdateCommandEnabled(IDC_DEVELOPER_MENU, true);
+  controller_.UpdateCommandEnabled(IDC_HELP_PAGE, true);
 }
 
 void Browser::UpdateNavigationCommands() {
@@ -2003,19 +2003,19 @@ void Browser::UpdateNavigationCommands() {
     SetStarredButtonToggled(web_contents->is_starred());
 
     // View-source should not be enabled if already in view-source mode.
-    controller_.UpdateCommandEnabled(IDC_VIEWSOURCE,
+    controller_.UpdateCommandEnabled(IDC_VIEW_SOURCE,
         current_tab->type() != TAB_CONTENTS_VIEW_SOURCE &&
         current_tab->controller()->GetActiveEntry());
 
-    controller_.UpdateCommandEnabled(IDC_ZOOM, true);
+    controller_.UpdateCommandEnabled(IDC_ZOOM_MENU, true);
     bool enable_encoding =
         SavePackage::IsSavableContents(web_contents->contents_mime_type()) &&
         SavePackage::IsSavableURL(current_tab->GetURL());
-    controller_.UpdateCommandEnabled(IDC_ENCODING, enable_encoding);
+    controller_.UpdateCommandEnabled(IDC_ENCODING_MENU, enable_encoding);
 
-    controller_.UpdateCommandEnabled(IDC_SAVEPAGE,
+    controller_.UpdateCommandEnabled(IDC_SAVE_PAGE,
         SavePackage::IsSavableURL(current_tab->GetURL()));
-    controller_.UpdateCommandEnabled(IDC_SHOW_JS_CONSOLE, true);
+    controller_.UpdateCommandEnabled(IDC_JS_CONSOLE, true);
     controller_.UpdateCommandEnabled(IDC_FIND, true);
     controller_.UpdateCommandEnabled(IDC_FIND_NEXT, true);
     controller_.UpdateCommandEnabled(IDC_FIND_PREVIOUS, true);
@@ -2023,19 +2023,19 @@ void Browser::UpdateNavigationCommands() {
     controller_.UpdateCommandEnabled(IDC_ZOOM_MINUS, true);
     controller_.UpdateCommandEnabled(IDC_ZOOM_NORMAL, true);
     controller_.UpdateCommandEnabled(IDC_STOP, true);
-    controller_.UpdateCommandEnabled(IDC_SHOW_JS_CONSOLE, true);
+    controller_.UpdateCommandEnabled(IDC_JS_CONSOLE, true);
     controller_.UpdateCommandEnabled(IDC_PRINT, true);
   } else {
-    controller_.UpdateCommandEnabled(IDC_VIEWSOURCE, false);
-    controller_.UpdateCommandEnabled(IDC_SHOW_JS_CONSOLE, false);
+    controller_.UpdateCommandEnabled(IDC_VIEW_SOURCE, false);
+    controller_.UpdateCommandEnabled(IDC_JS_CONSOLE, false);
 
     // Both disable the starring button and ensure it doesn't show a star.
     controller_.UpdateCommandEnabled(IDC_STAR, false);
     SetStarredButtonToggled(false);
-    controller_.UpdateCommandEnabled(IDC_ZOOM, false);
-    controller_.UpdateCommandEnabled(IDC_ENCODING, false);
+    controller_.UpdateCommandEnabled(IDC_ZOOM_MENU, false);
+    controller_.UpdateCommandEnabled(IDC_ENCODING_MENU, false);
 
-    controller_.UpdateCommandEnabled(IDC_SAVEPAGE, false);
+    controller_.UpdateCommandEnabled(IDC_SAVE_PAGE, false);
     controller_.UpdateCommandEnabled(IDC_FIND, false);
     controller_.UpdateCommandEnabled(IDC_FIND_NEXT, false);
     controller_.UpdateCommandEnabled(IDC_FIND_PREVIOUS, false);
@@ -2043,22 +2043,22 @@ void Browser::UpdateNavigationCommands() {
     controller_.UpdateCommandEnabled(IDC_ZOOM_MINUS, false);
     controller_.UpdateCommandEnabled(IDC_ZOOM_NORMAL, false);
     controller_.UpdateCommandEnabled(IDC_STOP, false);
-    controller_.UpdateCommandEnabled(IDC_SHOW_JS_CONSOLE, false);
+    controller_.UpdateCommandEnabled(IDC_JS_CONSOLE, false);
     controller_.UpdateCommandEnabled(IDC_PRINT, false);
   }
 
-  controller_.UpdateCommandEnabled(IDC_CREATE_SHORTCUT,
+  controller_.UpdateCommandEnabled(IDC_CREATE_SHORTCUTS,
                                    current_tab->type() == TAB_CONTENTS_WEB &&
                                        !current_tab->GetFavIcon().isNull());
-  controller_.UpdateCommandEnabled(IDC_DUPLICATE,
+  controller_.UpdateCommandEnabled(IDC_DUPLICATE_TAB,
                                    CanDuplicateContentsAt(selected_index()));
 
   // Enable various IDC_NEWPROFILEWINDOW* commands.
-  controller_.UpdateCommandEnabled(IDC_NEWPROFILEWINDOW, true);
+  controller_.UpdateCommandEnabled(IDC_PROFILE_MENU, true);
   controller_.UpdateCommandEnabled(IDC_SELECT_PROFILE, true);
   controller_.UpdateCommandEnabled(IDC_NEW_PROFILE, true);
-  for (int i = IDC_NEWPROFILEWINDOW_MIN_ID;
-       i <= IDC_NEWPROFILEWINDOW_MAX_ID;
+  for (int i = IDC_NEW_WINDOW_PROFILE_0;
+       i <= IDC_NEW_WINDOW_PROFILE_LAST;
        ++i) {
     controller_.UpdateCommandEnabled(i, true);
   }
@@ -2169,7 +2169,7 @@ void Browser::ProcessPendingUIUpdates() {
 
       if (contents == GetSelectedTabContents()) {
         TabContents* current_tab = GetSelectedTabContents();
-        controller_.UpdateCommandEnabled(IDC_CREATE_SHORTCUT,
+        controller_.UpdateCommandEnabled(IDC_CREATE_SHORTCUTS,
             current_tab->type() == TAB_CONTENTS_WEB &&
             !current_tab->GetFavIcon().isNull());
       }
diff --git a/chrome/browser/browser.h b/chrome/browser/browser.h
index a704199..648a04a 100644
--- a/chrome/browser/browser.h
+++ b/chrome/browser/browser.h
@@ -290,8 +290,8 @@ class Browser : public TabStripModelDelegate,
   void OpenHelpTab();
   void ShowHistoryTab();
   void ShowDownloadsTab();
-  void OpenBookmarksManager();
-  void ToggleBookmarksBar();
+  void OpenBookmarkManager();
+  void ToggleBookmarkBar();
   void OpenSelectProfileDialog();
   void OpenNewProfileDialog();
 
diff --git a/chrome/browser/browser_uitest.cc b/chrome/browser/browser_uitest.cc
index f3e42e3..d849860 100644
--- a/chrome/browser/browser_uitest.cc
+++ b/chrome/browser/browser_uitest.cc
@@ -180,11 +180,11 @@ TEST_F(BrowserTest, TabNavigationAccelerators) {
   // to.
   int old_tab_count = -1;
   ASSERT_TRUE(window->GetTabCount(&old_tab_count));
-  ASSERT_TRUE(window->ApplyAccelerator(IDC_NEWTAB));
+  ASSERT_TRUE(window->ApplyAccelerator(IDC_NEW_TAB));
   int new_tab_count;
   ASSERT_TRUE(window->WaitForTabCountToChange(old_tab_count, &new_tab_count,
       5000));
-  ASSERT_TRUE(window->ApplyAccelerator(IDC_NEWTAB));
+  ASSERT_TRUE(window->ApplyAccelerator(IDC_NEW_TAB));
   old_tab_count = new_tab_count;
   ASSERT_TRUE(window->WaitForTabCountToChange(old_tab_count, &new_tab_count,
       5000));
@@ -202,7 +202,7 @@ TEST_F(BrowserTest, TabNavigationAccelerators) {
   ASSERT_TRUE(window->WaitForTabToBecomeActive(1, 5000));
 
   // Navigate back to the first tab using the previous accelerators.
-  ASSERT_TRUE(window->ApplyAccelerator(IDC_SELECT_PREV_TAB));
+  ASSERT_TRUE(window->ApplyAccelerator(IDC_SELECT_PREVIOUS_TAB));
   ASSERT_TRUE(window->WaitForTabToBecomeActive(0, 5000));
 
   // Navigate to the last tab using the select last accelerator.
@@ -248,7 +248,7 @@ TEST_F(BrowserTest, DuplicateTab) {
   ASSERT_TRUE(automation()->GetBrowserWindowCount(&initial_window_count));
 
   // Duplicate the tab.
-  ASSERT_TRUE(browser_proxy->ApplyAccelerator(IDC_DUPLICATE));
+  ASSERT_TRUE(browser_proxy->ApplyAccelerator(IDC_DUPLICATE_TAB));
 
   // The duplicated tab should not end up in a new window.
   int window_count;
diff --git a/chrome/browser/render_view_context_menu.cc b/chrome/browser/render_view_context_menu.cc
index db7dc47..5806eb8 100644
--- a/chrome/browser/render_view_context_menu.cc
+++ b/chrome/browser/render_view_context_menu.cc
@@ -119,9 +119,9 @@ void RenderViewContextMenu::AppendSelectionItems() {
 void RenderViewContextMenu::AppendEditableItems() {
   // Append Dictionary spell check suggestions.
   for (size_t i = 0; i < misspelled_word_suggestions_.size() &&
-       IDC_USESPELLCHECKSUGGESTION_0 + i <= IDC_USESPELLCHECKSUGGESTION_LAST;
+       IDC_SPELLCHECK_SUGGESTION_0 + i <= IDC_SPELLCHECK_SUGGESTION_LAST;
        i ++) {
-    AppendMenuItemWithLabel(IDC_USESPELLCHECKSUGGESTION_0 + static_cast<int>(i),
+    AppendMenuItemWithLabel(IDC_SPELLCHECK_SUGGESTION_0 + static_cast<int>(i),
                             misspelled_word_suggestions_[i]);
   }
   if (misspelled_word_suggestions_.size() > 0)
@@ -147,22 +147,22 @@ void RenderViewContextMenu::AppendEditableItems() {
   AppendSeparator();
 
   // Add Spell Check options sub menu.
-  spellchecker_sub_menu_ = AppendSubMenu(IDC_SHOW_SPELLCHECKER_SUBMENU,
-      l10n_util::GetString(IDS_CONTENT_CONTEXT_SPELLCHECK_OPTIONS));
+  spellchecker_sub_menu_ = AppendSubMenu(IDC_SPELLCHECK_MENU,
+      l10n_util::GetString(IDS_CONTENT_CONTEXT_SPELLCHECK_MENU));
 
   // Add Spell Check languages to sub menu.
   std::vector<std::wstring> language_vector; 
   int current_language_index = SpellChecker::
       GetSpellCheckLanguagesToDisplayInContextMenu(profile_, &language_vector);
   // Add the spell check languages.
-  DCHECK(language_vector.size() <=
-         IDC_SPELLCHECKER_LANGUAGE_LAST - IDC_SPELLCHECKER_LANGUAGE_FIRST);
+  DCHECK(language_vector.size() <
+         IDC_SPELLCHECK_LANGUAGES_LAST - IDC_SPELLCHECK_LANGUAGES_FIRST);
   const std::wstring app_locale = g_browser_process->GetApplicationLocale();
   for (size_t i = 0; i < language_vector.size(); ++i) {
     std::wstring local_language(l10n_util::GetLocalName(
         language_vector.at(i), app_locale, true));
     spellchecker_sub_menu_->AppendMenuItem(
-        IDC_SPELLCHECKER_LANGUAGE_FIRST + i, local_language, RADIO);
+        IDC_SPELLCHECK_LANGUAGES_FIRST + i, local_language, RADIO);
   }
 
   // Add item in the sub menu to pop up the fonts and languages options menu.
diff --git a/chrome/browser/render_view_context_menu_controller.cc b/chrome/browser/render_view_context_menu_controller.cc
index e54868c..f8c77cb 100644
--- a/chrome/browser/render_view_context_menu_controller.cc
+++ b/chrome/browser/render_view_context_menu_controller.cc
@@ -104,8 +104,8 @@ std::wstring RenderViewContextMenuController::GetLabel(int id) const {
 
 bool RenderViewContextMenuController::IsCommandEnabled(int id) const {
   // Allow Spell Check language items on sub menu for text area context menu.
-  if (id >= IDC_SPELLCHECKER_LANGUAGE_FIRST
-      && id <= IDC_SPELLCHECKER_LANGUAGE_LAST) {
+  if ((id >= IDC_SPELLCHECK_LANGUAGES_FIRST) &&
+      (id < IDC_SPELLCHECK_LANGUAGES_LAST)) {
     return true;
   }
 
@@ -175,13 +175,13 @@ bool RenderViewContextMenuController::IsCommandEnabled(int id) const {
     case IDS_CONTENT_CONTEXT_COPYIMAGE:
     case IDS_CONTENT_CONTEXT_PRINT:
     case IDS_CONTENT_CONTEXT_SEARCHWEBFOR:
-    case IDC_USESPELLCHECKSUGGESTION_0:
-    case IDC_USESPELLCHECKSUGGESTION_1:
-    case IDC_USESPELLCHECKSUGGESTION_2:
-    case IDC_USESPELLCHECKSUGGESTION_3:
-    case IDC_USESPELLCHECKSUGGESTION_4:
+    case IDC_SPELLCHECK_SUGGESTION_0:
+    case IDC_SPELLCHECK_SUGGESTION_1:
+    case IDC_SPELLCHECK_SUGGESTION_2:
+    case IDC_SPELLCHECK_SUGGESTION_3:
+    case IDC_SPELLCHECK_SUGGESTION_4:
       return true;
-    case IDC_SHOW_SPELLCHECKER_SUBMENU:
+    case IDC_SPELLCHECK_MENU:
       return true;
     case IDS_CONTENT_CONTEXT_ADD_TO_DICTIONARY:
       return !params_.misspelled_word.empty();
@@ -204,7 +204,7 @@ bool RenderViewContextMenuController::IsItemChecked(int id) const {
   int spellcheck_language_index = SpellChecker::
       GetSpellCheckLanguagesToDisplayInContextMenu(
           source_web_contents_->profile(), &display_language_vector);
-  if (id - IDC_SPELLCHECKER_LANGUAGE_FIRST == spellcheck_language_index)
+  if (id - IDC_SPELLCHECK_LANGUAGES_FIRST == spellcheck_language_index)
     return true;
 
   return false;
@@ -246,19 +246,19 @@ bool RenderViewContextMenuController::GetAcceleratorInfo(
 
 void RenderViewContextMenuController::ExecuteCommand(int id) {
   // Check to see if one of the spell check language ids have been clicked.
-  if (id >= IDC_SPELLCHECKER_LANGUAGE_FIRST &&
-      id <= IDC_SPELLCHECKER_LANGUAGE_LAST) {
+  if (id >= IDC_SPELLCHECK_LANGUAGES_FIRST &&
+      id < IDC_SPELLCHECK_LANGUAGES_LAST) {
     std::vector<std::wstring> display_language_vector; 
     int current_language = SpellChecker::
         GetSpellCheckLanguagesToDisplayInContextMenu(
             source_web_contents_->profile(), &display_language_vector);
-    if (id - IDC_SPELLCHECKER_LANGUAGE_FIRST < 
+    if (id - IDC_SPELLCHECK_LANGUAGES_FIRST < 
         static_cast<int>(display_language_vector.size())) {
       StringPrefMember dictionary_language;
       dictionary_language.Init(prefs::kSpellCheckDictionary,
           source_web_contents_->profile()->GetPrefs(), NULL);
       dictionary_language.SetValue(display_language_vector.at(
-          id - IDC_SPELLCHECKER_LANGUAGE_FIRST));
+          id - IDC_SPELLCHECK_LANGUAGES_FIRST));
     }
       
     return;
@@ -433,13 +433,13 @@ void RenderViewContextMenuController::ExecuteCommand(int id) {
       break;
     }
 
-    case IDC_USESPELLCHECKSUGGESTION_0:
-    case IDC_USESPELLCHECKSUGGESTION_1:
-    case IDC_USESPELLCHECKSUGGESTION_2:
-    case IDC_USESPELLCHECKSUGGESTION_3:
-    case IDC_USESPELLCHECKSUGGESTION_4:
+    case IDC_SPELLCHECK_SUGGESTION_0:
+    case IDC_SPELLCHECK_SUGGESTION_1:
+    case IDC_SPELLCHECK_SUGGESTION_2:
+    case IDC_SPELLCHECK_SUGGESTION_3:
+    case IDC_SPELLCHECK_SUGGESTION_4:
       source_web_contents_->render_view_host()->Replace(
-          params_.dictionary_suggestions[id - IDC_USESPELLCHECKSUGGESTION_0]);
+          params_.dictionary_suggestions[id - IDC_SPELLCHECK_SUGGESTION_0]);
       break;
 
     case IDS_CONTENT_CONTEXT_ADD_TO_DICTIONARY:
diff --git a/chrome/browser/sessions/session_restore_uitest.cc b/chrome/browser/sessions/session_restore_uitest.cc
index f93098a..8843567 100644
--- a/chrome/browser/sessions/session_restore_uitest.cc
+++ b/chrome/browser/sessions/session_restore_uitest.cc
@@ -47,7 +47,7 @@ class SessionRestoreUITest : public UITest {
     scoped_ptr<BrowserProxy> browser_proxy(
         automation()->GetBrowserWindow(window_index));
     ASSERT_TRUE(browser_proxy.get());
-    ASSERT_TRUE(browser_proxy->ApplyAccelerator(IDC_CLOSEWINDOW));
+    ASSERT_TRUE(browser_proxy->ApplyAccelerator(IDC_CLOSE_WINDOW));
     browser_proxy.reset();
     int window_count;
     ASSERT_TRUE(automation()->WaitForWindowCountToChange(initial_count,
@@ -266,7 +266,7 @@ TEST_F(SessionRestoreUITest, DISABLED_DontRestoreWhileIncognito) {
   scoped_ptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0));
 
   // Create an off the record window and wait for it to appear.
-  ASSERT_TRUE(browser_proxy->ApplyAccelerator(IDC_GOOFFTHERECORD));
+  ASSERT_TRUE(browser_proxy->ApplyAccelerator(IDC_NEW_INCOGNITO_WINDOW));
   int window_count;
   ASSERT_TRUE(automation()->WaitForWindowCountToChange(1, &window_count,
                                                        kWaitForActionMsec) &&
@@ -389,7 +389,7 @@ TEST_F(SessionRestoreUITest, DISABLED_ShareProcessesOnRestore) {
 
   // Create two new tabs.
   int new_tab_count;
-  ASSERT_TRUE(browser_proxy->ApplyAccelerator(IDC_NEWTAB));
+  ASSERT_TRUE(browser_proxy->ApplyAccelerator(IDC_NEW_TAB));
   ASSERT_TRUE(browser_proxy->WaitForTabCountToChange(tab_count, &new_tab_count,
                                                      kWaitForActionMsec));
   scoped_ptr<TabProxy> last_tab(browser_proxy->GetTab(new_tab_count - 1));
@@ -397,7 +397,7 @@ TEST_F(SessionRestoreUITest, DISABLED_ShareProcessesOnRestore) {
   // Do a reload to ensure new tab page has loaded.
   ASSERT_TRUE(last_tab->Reload());
   tab_count = new_tab_count;
-  ASSERT_TRUE(browser_proxy->ApplyAccelerator(IDC_NEWTAB));
+  ASSERT_TRUE(browser_proxy->ApplyAccelerator(IDC_NEW_TAB));
   ASSERT_TRUE(browser_proxy->WaitForTabCountToChange(tab_count, &new_tab_count,
                                                      kWaitForActionMsec));
   last_tab.reset(browser_proxy->GetTab(new_tab_count - 1));
diff --git a/chrome/browser/tab_restore_uitest.cc b/chrome/browser/tab_restore_uitest.cc
index 6e813e8..73327ac 100644
--- a/chrome/browser/tab_restore_uitest.cc
+++ b/chrome/browser/tab_restore_uitest.cc
@@ -245,7 +245,7 @@ TEST_F(TabRestoreUITest, RestoreWindow) {
   new_tab->NavigateToURL(url2_);
 
   // Close the window.
-  ASSERT_TRUE(browser_proxy->ApplyAccelerator(IDC_CLOSEWINDOW));
+  ASSERT_TRUE(browser_proxy->ApplyAccelerator(IDC_CLOSE_WINDOW));
   browser_proxy.reset();
   new_tab.reset();
   ASSERT_TRUE(automation()->WaitForWindowCountToBecome(window_count - 1,
diff --git a/chrome/browser/view_source_uitest.cc b/chrome/browser/view_source_uitest.cc
index c943480..1aad505 100644
--- a/chrome/browser/view_source_uitest.cc
+++ b/chrome/browser/view_source_uitest.cc
@@ -84,7 +84,7 @@ TEST_F(ViewSourceTest, ViewSourceInPageMenuEnabledOnANormalPage) {
   GURL url = server.TestServerPageW(test_html_);
   NavigateToURL(url);
 
-  EXPECT_TRUE(IsPageMenuCommandEnabled(IDC_VIEWSOURCE));
+  EXPECT_TRUE(IsPageMenuCommandEnabled(IDC_VIEW_SOURCE));
 }
 
 // Make sure that when looking at the page source, we can't select
@@ -97,6 +97,6 @@ TEST_F(ViewSourceTest, ViewSourceInPageMenuDisabledWhileViewingSource) {
   GURL url_viewsource = GURL("view-source:" + url.spec());
   NavigateToURL(url_viewsource);
 
-  EXPECT_FALSE(IsPageMenuCommandEnabled(IDC_VIEWSOURCE));
+  EXPECT_FALSE(IsPageMenuCommandEnabled(IDC_VIEW_SOURCE));
 }
 
diff --git a/chrome/browser/views/find_bar_win_uitest.cc b/chrome/browser/views/find_bar_win_uitest.cc
index 7350779..2354d72a 100644
--- a/chrome/browser/views/find_bar_win_uitest.cc
+++ b/chrome/browser/views/find_bar_win_uitest.cc
@@ -255,7 +255,7 @@ TEST_F(FindInPageControllerTest, FindMovesOnTabClose_Issue1343052) {
   ASSERT_TRUE(browser.get() != NULL);
 
   // Toggle the bookmark bar state.
-  browser->ApplyAccelerator(IDC_SHOW_BOOKMARKS_BAR);
+  browser->ApplyAccelerator(IDC_SHOW_BOOKMARK_BAR);
   EXPECT_TRUE(WaitForBookmarkBarVisibilityChange(browser.get(), true));
 
   // Open the Find window and wait for it to animate.
@@ -280,8 +280,8 @@ TEST_F(FindInPageControllerTest, FindMovesOnTabClose_Issue1343052) {
   EXPECT_EQ(x, new_x);
   EXPECT_EQ(y, new_y);
 
-  // Now reset the bookmarks bar state and try the same again.
-  browser->ApplyAccelerator(IDC_SHOW_BOOKMARKS_BAR);
+  // Now reset the bookmark bar state and try the same again.
+  browser->ApplyAccelerator(IDC_SHOW_BOOKMARK_BAR);
   EXPECT_TRUE(WaitForBookmarkBarVisibilityChange(browser.get(), false));
 
   // Bookmark bar has moved, reset our coordinates.
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
index ccbb950..7c84c6d 100644
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -82,22 +82,22 @@ static const int kLoadingAnimationFrameTimeMs = 30;
 
 static const struct { bool separator; int command; int label; } kMenuLayout[] = {
   { true, 0, 0 },
-  { false, IDC_TASKMANAGER, IDS_TASKMANAGER },
+  { false, IDC_TASK_MANAGER, IDS_TASK_MANAGER },
   { true, 0, 0 },
-  { false, IDC_ENCODING, IDS_ENCODING },
-  { false, IDC_ZOOM, IDS_ZOOM },
+  { false, IDC_ENCODING_MENU, IDS_ENCODING_MENU },
+  { false, IDC_ZOOM_MENU, IDS_ZOOM_MENU },
   { false, IDC_PRINT, IDS_PRINT },
-  { false, IDC_SAVEPAGE, IDS_SAVEPAGEAS },
-  { false, IDC_FIND, IDS_FIND_IN_PAGE },
+  { false, IDC_SAVE_PAGE, IDS_SAVE_PAGE },
+  { false, IDC_FIND, IDS_FIND },
   { true, 0, 0 },
   { false, IDC_PASTE, IDS_PASTE },
   { false, IDC_COPY, IDS_COPY },
   { false, IDC_CUT, IDS_CUT },
   { true, 0, 0 },
-  { false, IDC_NEWTAB, IDS_APP_MENU_NEW_WEB_PAGE },
+  { false, IDC_NEW_TAB, IDS_APP_MENU_NEW_WEB_PAGE },
   { false, IDC_SHOW_AS_TAB, IDS_SHOW_AS_TAB },
   { false, IDC_COPY_URL, IDS_APP_MENU_COPY_URL },
-  { false, IDC_DUPLICATE, IDS_APP_MENU_DUPLICATE },
+  { false, IDC_DUPLICATE_TAB, IDS_APP_MENU_DUPLICATE_APP_WINDOW },
   { true, 0, 0 },
   { false, IDC_RELOAD, IDS_APP_MENU_RELOAD },
   { false, IDC_FORWARD, IDS_CONTENT_CONTEXT_FORWARD },
@@ -991,8 +991,8 @@ void BrowserView::InitSystemMenu() {
   // to change.
   if (browser_->type() == Browser::TYPE_NORMAL) {
     system_menu_->AddSeparator(insertion_index);
-    system_menu_->AddMenuItemWithLabel(insertion_index, IDC_TASKMANAGER,
-                                       l10n_util::GetString(IDS_TASKMANAGER));
+    system_menu_->AddMenuItemWithLabel(insertion_index, IDC_TASK_MANAGER,
+                                       l10n_util::GetString(IDS_TASK_MANAGER));
     // If it's a regular browser window with tabs, we don't add any more items,
     // since it already has menus (Page, Chrome).
   } else {
@@ -1250,17 +1250,17 @@ void BrowserView::BuildMenuForTabStriplessWindow(Menu* menu,
       menu->AddSeparator(insertion_index);
     } else {
       int command = kMenuLayout[i].command;
-      if (command == IDC_ENCODING) {
+      if (command == IDC_ENCODING_MENU) {
         Menu* encoding_menu = menu->AddSubMenu(
             insertion_index,
-            IDC_ENCODING,
-            l10n_util::GetString(IDS_ENCODING));
+            IDC_ENCODING_MENU,
+            l10n_util::GetString(IDS_ENCODING_MENU));
         encoding_menu->set_delegate(encoding_menu_delegate_.get());
         EncodingMenuControllerDelegate::BuildEncodingMenu(browser_->profile(),
                                                           encoding_menu);
-      } else if (command == IDC_ZOOM) {
-        Menu* zoom_menu = menu->AddSubMenu(insertion_index, IDC_ZOOM,
-                                           l10n_util::GetString(IDS_ZOOM));
+      } else if (command == IDC_ZOOM_MENU) {
+        Menu* zoom_menu = menu->AddSubMenu(insertion_index, IDC_ZOOM_MENU,
+                                           l10n_util::GetString(IDS_ZOOM_MENU));
         zoom_menu->AppendMenuItemWithLabel(
             IDC_ZOOM_PLUS,
             l10n_util::GetString(IDS_ZOOM_PLUS));
@@ -1293,11 +1293,11 @@ int BrowserView::GetCommandIDForAppCommandID(int app_command_id) const {
     case APPCOMMAND_BROWSER_SEARCH:
       return IDC_FOCUS_SEARCH;
     case APPCOMMAND_CLOSE:
-      return IDC_CLOSETAB;
+      return IDC_CLOSE_TAB;
     case APPCOMMAND_NEW:
-      return IDC_NEWTAB;
+      return IDC_NEW_TAB;
     case APPCOMMAND_OPEN:
-      return IDC_OPENFILE;
+      return IDC_OPEN_FILE;
     case APPCOMMAND_PRINT:
       return IDC_PRINT;
 
diff --git a/chrome/browser/views/location_bar_view.cc b/chrome/browser/views/location_bar_view.cc
index c8a4ebc..30a8a8c 100644
--- a/chrome/browser/views/location_bar_view.cc
+++ b/chrome/browser/views/location_bar_view.cc
@@ -321,7 +321,7 @@ void LocationBarView::OnAutocompleteAccept(
 
   if (controller_) {
     if (alternate_nav_url.empty()) {
-      controller_->ExecuteCommand(IDC_OPENURL);
+      controller_->ExecuteCommand(IDC_OPEN_CURRENT_URL);
       return;
     }
 
@@ -330,7 +330,7 @@ void LocationBarView::OnAutocompleteAccept(
     // The AlternateNavURLFetcher will listen for the pending navigation
     // notification that will be issued as a result of the "open URL." It
     // will automatically install itself into that navigation controller.
-    controller_->ExecuteCommand(IDC_OPENURL);
+    controller_->ExecuteCommand(IDC_OPEN_CURRENT_URL);
     if (fetcher->state() == AlternateNavURLFetcher::NOT_STARTED) {
       // I'm not sure this should be reachable, but I'm not also sure enough
       // that it shouldn't to stick in a NOTREACHED().  In any case, this is
diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc
index 246f1c7..e46ca09 100644
--- a/chrome/browser/views/toolbar_view.cc
+++ b/chrome/browser/views/toolbar_view.cc
@@ -470,8 +470,8 @@ void BrowserToolbarView::RunPageMenu(const CPoint& pt, HWND hwnd) {
   Menu menu(this, anchor, hwnd);
   // The install menu may be dynamically generated with a contextual label.
   // See browser_commands.cc.
-  menu.AppendMenuItemWithLabel(IDC_CREATE_SHORTCUT,
-      l10n_util::GetString(IDS_DEFAULT_INSTALL_SITE_LABEL));
+  menu.AppendMenuItemWithLabel(IDC_CREATE_SHORTCUTS,
+      l10n_util::GetString(IDS_CREATE_SHORTCUTS));
   menu.AppendSeparator();
   menu.AppendMenuItemWithLabel(IDC_CUT, l10n_util::GetString(IDS_CUT));
   menu.AppendMenuItemWithLabel(IDC_COPY, l10n_util::GetString(IDS_COPY));
@@ -479,14 +479,14 @@ void BrowserToolbarView::RunPageMenu(const CPoint& pt, HWND hwnd) {
   menu.AppendSeparator();
 
   menu.AppendMenuItemWithLabel(IDC_FIND,
-                               l10n_util::GetString(IDS_FIND_IN_PAGE));
-  menu.AppendMenuItemWithLabel(IDC_SAVEPAGE,
-                               l10n_util::GetString(IDS_SAVEPAGEAS));
+                               l10n_util::GetString(IDS_FIND));
+  menu.AppendMenuItemWithLabel(IDC_SAVE_PAGE,
+                               l10n_util::GetString(IDS_SAVE_PAGE));
   menu.AppendMenuItemWithLabel(IDC_PRINT, l10n_util::GetString(IDS_PRINT));
   menu.AppendSeparator();
 
-  Menu* zoom_menu = menu.AppendSubMenu(IDC_ZOOM,
-                                       l10n_util::GetString(IDS_ZOOM));
+  Menu* zoom_menu = menu.AppendSubMenu(IDC_ZOOM_MENU,
+                                       l10n_util::GetString(IDS_ZOOM_MENU));
   zoom_menu->AppendMenuItemWithLabel(IDC_ZOOM_PLUS,
                                      l10n_util::GetString(IDS_ZOOM_PLUS));
   zoom_menu->AppendMenuItemWithLabel(IDC_ZOOM_NORMAL,
@@ -495,8 +495,8 @@ void BrowserToolbarView::RunPageMenu(const CPoint& pt, HWND hwnd) {
                                      l10n_util::GetString(IDS_ZOOM_MINUS));
 
   // Create encoding menu.
-  Menu* encoding_menu = menu.AppendSubMenu(IDC_ENCODING,
-                                           l10n_util::GetString(IDS_ENCODING));
+  Menu* encoding_menu = menu.AppendSubMenu(
+      IDC_ENCODING_MENU, l10n_util::GetString(IDS_ENCODING_MENU));
 
   EncodingMenuControllerDelegate::BuildEncodingMenu(profile_, encoding_menu);
 
@@ -505,15 +505,15 @@ void BrowserToolbarView::RunPageMenu(const CPoint& pt, HWND hwnd) {
     unsigned int menu_label_id;
   };
   struct MenuCreateMaterial developer_menu_materials[] = {
-    { IDC_VIEWSOURCE, IDS_VIEWPAGESOURCE },
+    { IDC_VIEW_SOURCE, IDS_VIEW_SOURCE },
     { IDC_DEBUGGER, IDS_DEBUGGER },
-    { IDC_SHOW_JS_CONSOLE, IDS_VIEWJSCONSOLE },
-    { IDC_TASKMANAGER, IDS_TASKMANAGER }
+    { IDC_JS_CONSOLE, IDS_JS_CONSOLE },
+    { IDC_TASK_MANAGER, IDS_TASK_MANAGER }
   };
   // Append developer menu.
   menu.AppendSeparator();
-  Menu* developer_menu =
-    menu.AppendSubMenu(IDC_DEVELOPER, l10n_util::GetString(IDS_DEVELOPER));
+  Menu* developer_menu = menu.AppendSubMenu(IDC_DEVELOPER_MENU,
+      l10n_util::GetString(IDS_DEVELOPER_MENU));
   for (int i = 0; i < arraysize(developer_menu_materials); ++i) {
     if (developer_menu_materials[i].menu_id) {
       developer_menu->AppendMenuItemWithLabel(
@@ -526,8 +526,8 @@ void BrowserToolbarView::RunPageMenu(const CPoint& pt, HWND hwnd) {
 
   menu.AppendSeparator();
 
-  menu.AppendMenuItemWithLabel(IDS_COMMANDS_REPORTBUG,
-                               l10n_util::GetString(IDS_COMMANDS_REPORTBUG));
+  menu.AppendMenuItemWithLabel(IDC_REPORT_BUG,
+                               l10n_util::GetString(IDS_REPORT_BUG));
   menu.RunMenuAt(pt.x, pt.y);
 }
 
@@ -537,23 +537,23 @@ void BrowserToolbarView::RunAppMenu(const CPoint& pt, HWND hwnd) {
     anchor = Menu::TOPLEFT;
 
   Menu menu(this, anchor, hwnd);
-  menu.AppendMenuItemWithLabel(IDC_NEWTAB, l10n_util::GetString(IDS_NEWTAB));
-  menu.AppendMenuItemWithLabel(IDC_NEWWINDOW,
-                               l10n_util::GetString(IDS_NEWWINDOW));
-  menu.AppendMenuItemWithLabel(IDC_GOOFFTHERECORD,
-                               l10n_util::GetString(IDS_GOOFFTHERECORD));
+  menu.AppendMenuItemWithLabel(IDC_NEW_TAB, l10n_util::GetString(IDS_NEW_TAB));
+  menu.AppendMenuItemWithLabel(IDC_NEW_WINDOW,
+                               l10n_util::GetString(IDS_NEW_WINDOW));
+  menu.AppendMenuItemWithLabel(IDC_NEW_INCOGNITO_WINDOW,
+                               l10n_util::GetString(IDS_NEW_INCOGNITO_WINDOW));
 
   // Enumerate profiles asynchronously and then create the parent menu item
   // "Open new window in profile...". We will create the child menu items for
   // this once the asynchronous call is done. See OnGetProfilesDone.
   profiles_helper_->GetProfiles(NULL);
   Menu* profiles_menu = menu.AppendSubMenu(
-      IDC_NEWPROFILEWINDOW,
-      l10n_util::GetString(IDS_NEWPROFILEWINDOW));
+      IDC_PROFILE_MENU,
+      l10n_util::GetString(IDS_PROFILE_MENU));
   profiles_menu_ = profiles_menu;
 
   menu.AppendSeparator();
-  menu.AppendMenuItemWithLabel(IDC_SHOW_BOOKMARKS_BAR,
+  menu.AppendMenuItemWithLabel(IDC_SHOW_BOOKMARK_BAR,
                                l10n_util::GetString(IDS_SHOW_BOOKMARK_BAR));
   menu.AppendSeparator();
   menu.AppendMenuItemWithLabel(IDC_SHOW_HISTORY,
@@ -568,13 +568,12 @@ void BrowserToolbarView::RunAppMenu(const CPoint& pt, HWND hwnd) {
   menu.AppendMenuItemWithLabel(IDC_IMPORT_SETTINGS,
                                l10n_util::GetString(IDS_IMPORT_SETTINGS));
   menu.AppendSeparator();
-  menu.AppendMenuItemWithLabel(IDC_OPTIONS,
-      l10n_util::GetStringF(IDS_OPTIONS,
-      l10n_util::GetString(IDS_PRODUCT_NAME)));
-  menu.AppendMenuItemWithLabel(IDC_ABOUT,
-      l10n_util::GetStringF(IDS_ABOUT,
-      l10n_util::GetString(IDS_PRODUCT_NAME)));
-  menu.AppendMenuItemWithLabel(IDC_HELPMENU, l10n_util::GetString(IDS_HELP));
+  menu.AppendMenuItemWithLabel(IDC_OPTIONS, l10n_util::GetStringF(IDS_OPTIONS,
+                               l10n_util::GetString(IDS_PRODUCT_NAME)));
+  menu.AppendMenuItemWithLabel(IDC_ABOUT, l10n_util::GetStringF(IDS_ABOUT,
+                               l10n_util::GetString(IDS_PRODUCT_NAME)));
+  menu.AppendMenuItemWithLabel(IDC_HELP_PAGE,
+                               l10n_util::GetString(IDS_HELP_PAGE));
   menu.AppendSeparator();
   menu.AppendMenuItemWithLabel(IDC_EXIT, l10n_util::GetString(IDS_EXIT));
 
@@ -587,7 +586,7 @@ void BrowserToolbarView::RunAppMenu(const CPoint& pt, HWND hwnd) {
 bool BrowserToolbarView::IsItemChecked(int id) const {
   if (!profile_)
     return false;
-  if (id == IDC_SHOW_BOOKMARKS_BAR)
+  if (id == IDC_SHOW_BOOKMARK_BAR)
     return profile_->GetPrefs()->GetBoolean(prefs::kShowBookmarkBar);
   else
     return EncodingMenuControllerDelegate::IsItemChecked(id);
@@ -617,12 +616,12 @@ void BrowserToolbarView::OnGetProfilesDone(
   browser_->set_user_data_dir_profiles(profiles);
 
   // Number of sub menu items that we can show directly.
-  const int sub_items_count = IDC_NEWPROFILEWINDOW_MAX_ID -
-                              IDC_NEWPROFILEWINDOW_MIN_ID + 1;
+  const int sub_items_count = IDC_NEW_WINDOW_PROFILE_0 -
+                              IDC_NEW_WINDOW_PROFILE_LAST + 1;
   std::vector<std::wstring>::const_iterator iter = profiles.begin();
   // Add direct sub menu items for profiles.
-  for (int i = IDC_NEWPROFILEWINDOW_MIN_ID;
-       i <= IDC_NEWPROFILEWINDOW_MAX_ID && iter != profiles.end();
+  for (int i = IDC_NEW_WINDOW_PROFILE_0;
+       i <= IDC_NEW_WINDOW_PROFILE_LAST && iter != profiles.end();
        ++i, ++iter) {
     profiles_menu_->AppendMenuItemWithLabel(i, *iter);
   }
@@ -630,8 +629,7 @@ void BrowserToolbarView::OnGetProfilesDone(
   if (iter != profiles.end()) {
     profiles_menu_->AppendSeparator();
     profiles_menu_->AppendMenuItemWithLabel(
-        IDC_SELECT_PROFILE,
-        l10n_util::GetString(IDS_NEWPROFILEWINDOW_OTHERPROFILE));
+        IDC_SELECT_PROFILE, l10n_util::GetString(IDS_SELECT_PROFILE));
   }
   // Always show a link to select a new profile.
   profiles_menu_->AppendSeparator();
@@ -752,8 +750,8 @@ void BrowserToolbarView::ExecuteCommand(int id) {
   // If the command id is for one of the sub-menu-items of the new profile
   // window menu then we need to get the name of the profile from the menu
   // item id and then pass on that to the browser to take action.
-  if (id >= IDC_NEWPROFILEWINDOW_MIN_ID && id <= IDC_NEWPROFILEWINDOW_MAX_ID) {
-    browser_->NewProfileWindowByIndex(id - IDC_NEWPROFILEWINDOW_MIN_ID);
+  if (id >= IDC_NEW_WINDOW_PROFILE_0 && id <= IDC_NEW_WINDOW_PROFILE_LAST) {
+    browser_->NewProfileWindowByIndex(id - IDC_NEW_WINDOW_PROFILE_0);
     return;
   }