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

1 files changed, 37 insertions, 37 deletions

diff --git a/chrome/app/chrome_dll.rc b/chrome/app/chrome_dll.rc
index 0c0a564..da31f89 100644
--- a/chrome/app/chrome_dll.rc
+++ b/chrome/app/chrome_dll.rc
@@ -34,15 +34,15 @@ IDR_MAINFRAME ACCELERATORS
 BEGIN
     VK_LEFT,             IDC_BACK,           VIRTKEY, ALT
     VK_BACK,             IDC_BACK,           VIRTKEY
-    VK_F4,               IDC_CLOSETAB,       VIRTKEY, CONTROL
-    "W",                 IDC_CLOSETAB,       VIRTKEY, CONTROL
-    "W",                 IDC_CLOSEPOPUPS,    VIRTKEY, SHIFT, ALT
-    "L",                 IDC_DEBUGGER,       VIRTKEY, SHIFT, CONTROL
-    "J",                 IDC_SHOW_JS_CONSOLE,VIRTKEY, SHIFT, CONTROL
+    VK_F4,               IDC_CLOSE_TAB,      VIRTKEY, CONTROL
+    "W",                 IDC_CLOSE_TAB,      VIRTKEY, CONTROL
+    "W",                 IDC_CLOSE_POPUPS,   VIRTKEY, SHIFT, ALT
+    "L",                 IDC_DEBUGGER,       VIRTKEY, CONTROL, SHIFT
+    "J",                 IDC_JS_CONSOLE,     VIRTKEY, CONTROL, SHIFT
     "F",                 IDC_FIND,           VIRTKEY, CONTROL
     "G",                 IDC_FIND_NEXT,      VIRTKEY, CONTROL
     VK_F3,               IDC_FIND_NEXT,      VIRTKEY
-    "G",                 IDC_FIND_PREVIOUS,  VIRTKEY, SHIFT, CONTROL
+    "G",                 IDC_FIND_PREVIOUS,  VIRTKEY, CONTROL, SHIFT
     VK_F3,               IDC_FIND_PREVIOUS,  VIRTKEY, SHIFT
     VK_F6,               IDC_FOCUS_LOCATION, VIRTKEY
     "D",                 IDC_FOCUS_LOCATION, VIRTKEY, ALT
@@ -52,34 +52,34 @@ BEGIN
     "T",                 IDC_FOCUS_TOOLBAR,  VIRTKEY, SHIFT, ALT
     VK_RIGHT,            IDC_FORWARD,        VIRTKEY, ALT
     VK_BACK,             IDC_FORWARD,        VIRTKEY, SHIFT
-    VK_F1,               IDC_HELPMENU,       VIRTKEY
-    "T",                 IDC_NEWTAB,         VIRTKEY, CONTROL
-    "N",                 IDC_NEWWINDOW,      VIRTKEY, CONTROL
+    VK_F1,               IDC_HELP_PAGE,      VIRTKEY
+    "T",                 IDC_NEW_TAB,        VIRTKEY, CONTROL
+    "N",                 IDC_NEW_WINDOW,     VIRTKEY, CONTROL
     // CTRL + M is used for opening the dialog to let the user select
     // a profile to open a new window.
     // CTRL + SHIFT + N (N = 1 to 9) is used to let the user open a new
     // window in profile 1 to profile 9 directly.
-    "M",                 IDC_NEWPROFILEWINDOW,            VIRTKEY,    CONTROL
-    "1",                 IDC_NEWPROFILEWINDOW_PROFILE1,   VIRTKEY,    CONTROL, SHIFT
-    VK_NUMPAD1,          IDC_NEWPROFILEWINDOW_PROFILE1,   VIRTKEY,    CONTROL, SHIFT
-    "2",                 IDC_NEWPROFILEWINDOW_PROFILE2,   VIRTKEY,    CONTROL, SHIFT
-    VK_NUMPAD2,          IDC_NEWPROFILEWINDOW_PROFILE2,   VIRTKEY,    CONTROL, SHIFT
-    "3",                 IDC_NEWPROFILEWINDOW_PROFILE3,   VIRTKEY,    CONTROL, SHIFT
-    VK_NUMPAD3,          IDC_NEWPROFILEWINDOW_PROFILE3,   VIRTKEY,    CONTROL, SHIFT
-    "4",                 IDC_NEWPROFILEWINDOW_PROFILE4,   VIRTKEY,    CONTROL, SHIFT
-    VK_NUMPAD4,          IDC_NEWPROFILEWINDOW_PROFILE4,   VIRTKEY,    CONTROL, SHIFT
-    "5",                 IDC_NEWPROFILEWINDOW_PROFILE5,   VIRTKEY,    CONTROL, SHIFT
-    VK_NUMPAD5,          IDC_NEWPROFILEWINDOW_PROFILE5,   VIRTKEY,    CONTROL, SHIFT
-    "6",                 IDC_NEWPROFILEWINDOW_PROFILE6,   VIRTKEY,    CONTROL, SHIFT
-    VK_NUMPAD6,          IDC_NEWPROFILEWINDOW_PROFILE6,   VIRTKEY,    CONTROL, SHIFT
-    "7",                 IDC_NEWPROFILEWINDOW_PROFILE7,   VIRTKEY,    CONTROL, SHIFT
-    VK_NUMPAD7,          IDC_NEWPROFILEWINDOW_PROFILE7,   VIRTKEY,    CONTROL, SHIFT
-    "8",                 IDC_NEWPROFILEWINDOW_PROFILE8,   VIRTKEY,    CONTROL, SHIFT
-    VK_NUMPAD8,          IDC_NEWPROFILEWINDOW_PROFILE8,   VIRTKEY,    CONTROL, SHIFT
-    "9",                 IDC_NEWPROFILEWINDOW_PROFILE9,   VIRTKEY,    CONTROL, SHIFT
-    VK_NUMPAD9,          IDC_NEWPROFILEWINDOW_PROFILE9,   VIRTKEY,    CONTROL, SHIFT
-    "N",                 IDC_GOOFFTHERECORD, VIRTKEY, CONTROL, SHIFT
-    "O",                 IDC_OPENFILE,       VIRTKEY, CONTROL
+    "M",                 IDC_SELECT_PROFILE,        VIRTKEY, CONTROL
+    "1",                 IDC_NEW_WINDOW_PROFILE_0,  VIRTKEY, CONTROL, SHIFT
+    VK_NUMPAD1,          IDC_NEW_WINDOW_PROFILE_0,  VIRTKEY, CONTROL, SHIFT
+    "2",                 IDC_NEW_WINDOW_PROFILE_1,  VIRTKEY, CONTROL, SHIFT
+    VK_NUMPAD2,          IDC_NEW_WINDOW_PROFILE_1,  VIRTKEY, CONTROL, SHIFT
+    "3",                 IDC_NEW_WINDOW_PROFILE_2,  VIRTKEY, CONTROL, SHIFT
+    VK_NUMPAD3,          IDC_NEW_WINDOW_PROFILE_2,  VIRTKEY, CONTROL, SHIFT
+    "4",                 IDC_NEW_WINDOW_PROFILE_3,  VIRTKEY, CONTROL, SHIFT
+    VK_NUMPAD4,          IDC_NEW_WINDOW_PROFILE_3,  VIRTKEY, CONTROL, SHIFT
+    "5",                 IDC_NEW_WINDOW_PROFILE_4,  VIRTKEY, CONTROL, SHIFT
+    VK_NUMPAD5,          IDC_NEW_WINDOW_PROFILE_4,  VIRTKEY, CONTROL, SHIFT
+    "6",                 IDC_NEW_WINDOW_PROFILE_5,  VIRTKEY, CONTROL, SHIFT
+    VK_NUMPAD6,          IDC_NEW_WINDOW_PROFILE_5,  VIRTKEY, CONTROL, SHIFT
+    "7",                 IDC_NEW_WINDOW_PROFILE_6,  VIRTKEY, CONTROL, SHIFT
+    VK_NUMPAD7,          IDC_NEW_WINDOW_PROFILE_6,  VIRTKEY, CONTROL, SHIFT
+    "8",                 IDC_NEW_WINDOW_PROFILE_7,  VIRTKEY, CONTROL, SHIFT
+    VK_NUMPAD8,          IDC_NEW_WINDOW_PROFILE_7,  VIRTKEY, CONTROL, SHIFT
+    "9",                 IDC_NEW_WINDOW_PROFILE_8,  VIRTKEY, CONTROL, SHIFT
+    VK_NUMPAD9,          IDC_NEW_WINDOW_PROFILE_8,  VIRTKEY, CONTROL, SHIFT
+    "N",                 IDC_NEW_INCOGNITO_WINDOW,  VIRTKEY, CONTROL, SHIFT
+    "O",                 IDC_OPEN_FILE,      VIRTKEY, CONTROL
     "P",                 IDC_PRINT,          VIRTKEY, CONTROL
     "R",                 IDC_RELOAD,         VIRTKEY, CONTROL
     VK_F5,               IDC_RELOAD,         VIRTKEY
@@ -87,13 +87,13 @@ BEGIN
     VK_F5,               IDC_RELOAD,         VIRTKEY, SHIFT
     VK_HOME,             IDC_HOME,           VIRTKEY, ALT
     "T",                 IDC_RESTORE_TAB,    VIRTKEY, CONTROL, SHIFT
-    "S",                 IDC_SAVEPAGE,       VIRTKEY, CONTROL
+    "S",                 IDC_SAVE_PAGE,      VIRTKEY, CONTROL
     "9",                 IDC_SELECT_LAST_TAB,VIRTKEY, CONTROL
     VK_NUMPAD9,          IDC_SELECT_LAST_TAB,VIRTKEY, CONTROL
     VK_TAB,              IDC_SELECT_NEXT_TAB,VIRTKEY, CONTROL
     VK_NEXT,             IDC_SELECT_NEXT_TAB,VIRTKEY, CONTROL
-    VK_TAB,              IDC_SELECT_PREV_TAB,VIRTKEY, SHIFT, CONTROL
-    VK_PRIOR,            IDC_SELECT_PREV_TAB,VIRTKEY, CONTROL
+    VK_TAB,              IDC_SELECT_PREVIOUS_TAB,   VIRTKEY, CONTROL, SHIFT
+    VK_PRIOR,            IDC_SELECT_PREVIOUS_TAB,   VIRTKEY, CONTROL
 // NOTE: IDC_SELECT_TAB_N is bound to the key N+1, and selects the tab at
 // index N. For example, IDC_SELECT_TAB_0 is bound to control 1, and selects
 // the tab at index 0.
@@ -113,14 +113,14 @@ BEGIN
     VK_NUMPAD7,          IDC_SELECT_TAB_6,   VIRTKEY, CONTROL
     "8",                 IDC_SELECT_TAB_7,   VIRTKEY, CONTROL
     VK_NUMPAD8,          IDC_SELECT_TAB_7,   VIRTKEY, CONTROL
-    "B",                 IDC_SHOW_BOOKMARKS_BAR, VIRTKEY, CONTROL
+    "B",                 IDC_SHOW_BOOKMARK_BAR,     VIRTKEY, CONTROL
     "B",                 IDC_SHOW_BOOKMARK_MANAGER, VIRTKEY, CONTROL, SHIFT
     "J",                 IDC_SHOW_DOWNLOADS, VIRTKEY, CONTROL
     "H",                 IDC_SHOW_HISTORY,   VIRTKEY, CONTROL
     "D",                 IDC_STAR,           VIRTKEY, CONTROL
     VK_ESCAPE,           IDC_STOP,           VIRTKEY
-    VK_ESCAPE,           IDC_TASKMANAGER,    VIRTKEY, SHIFT
-    "U",                 IDC_VIEWSOURCE,     VIRTKEY, CONTROL
+    VK_ESCAPE,           IDC_TASK_MANAGER,   VIRTKEY, SHIFT
+    "U",                 IDC_VIEW_SOURCE,    VIRTKEY, CONTROL
     VK_OEM_MINUS,        IDC_ZOOM_MINUS,     VIRTKEY, CONTROL
     VK_OEM_MINUS,        IDC_ZOOM_MINUS,     VIRTKEY, CONTROL, SHIFT
     VK_SUBTRACT,         IDC_ZOOM_MINUS,     VIRTKEY, CONTROL
@@ -180,7 +180,7 @@ IDR_MAINFRAME           ICON                    "theme\chromium\chromium.ico"
 // Bitmap
 //
 
-IDR_CRASHED_PLUGIN      BINDATA                 "resources\\sadplugin.png"
+IDR_SAD_PLUGIN      BINDATA                     "resources\\sadplugin.png"
 
 /////////////////////////////////////////////////////////////////////////////
 //