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

4 files changed, 61 insertions, 63 deletions

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;
   }