Cleanup part 5.

Reorder identifiers, functions, initalization statements, etc. to all match.  This preserves the original groups Ben created but makes a couple of changes:
* Within each group, the order is now "by GUI order" instead of random.  This can be subjective, but when I tried doing alphabetical order, it resulted in related functionality being separated pretty arbitrarily.
* I moved the "window management" functions next to (but above) the "page-related" functions (this seemed a little more logical, but maybe not)

I also renamed UpdateNavigationCommands() to try and reflect that it updates a lot more than navigation commands, and moved some unconditionally-initialized commands (profile stuff) in there over to InitCommandState() where they belong.
Review URL: http://codereview.chromium.org/13681

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

1 files changed, 12 insertions, 12 deletions

diff --git a/chrome/app/chrome_dll.rc b/chrome/app/chrome_dll.rc
index 6887ca0..f8005ad 100644
--- a/chrome/app/chrome_dll.rc
+++ b/chrome/app/chrome_dll.rc
@@ -38,7 +38,6 @@ BEGIN
     "W",            IDC_CLOSE_TAB,              VIRTKEY, CONTROL
     "W",            IDC_CLOSE_POPUPS,           VIRTKEY, SHIFT, ALT
     VK_OEM_3,       IDC_DEBUGGER,               VIRTKEY, ALT
-    "J",            IDC_JS_CONSOLE,             VIRTKEY, CONTROL, SHIFT
     "F",            IDC_FIND,                   VIRTKEY, CONTROL
     "G",            IDC_FIND_NEXT,              VIRTKEY, CONTROL
     VK_F3,          IDC_FIND_NEXT,              VIRTKEY
@@ -53,13 +52,14 @@ BEGIN
     VK_RIGHT,       IDC_FORWARD,                VIRTKEY, ALT
     VK_BACK,        IDC_FORWARD,                VIRTKEY, SHIFT
     VK_F1,          IDC_HELP_PAGE,              VIRTKEY
+    "J",            IDC_JS_CONSOLE,             VIRTKEY, CONTROL, SHIFT
+    "N",            IDC_NEW_INCOGNITO_WINDOW,   VIRTKEY, CONTROL, SHIFT
     "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_SELECT_PROFILE,         VIRTKEY, CONTROL
+    // NOTE: IDC_NEW_WINDOW_PROFILE_N is bound to the key ctrl-shift-(N+1), and
+    // opens a new window using profile number N. For example,
+    // IDC_NEW_WINDOW_PROFILE_0 is bound to ctrl-shift-1, and opens a window in
+    // profile 0.
     "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
@@ -78,7 +78,6 @@ BEGIN
     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
@@ -94,9 +93,10 @@ BEGIN
     VK_NEXT,        IDC_SELECT_NEXT_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.
+    "M",            IDC_SELECT_PROFILE,         VIRTKEY, CONTROL
+    // NOTE: IDC_SELECT_TAB_N is bound to the key ctrl-(N+1), and selects the
+    // tab at index N. For example, IDC_SELECT_TAB_0 is bound to ctrl-1, and
+    // selects the tab at index 0.
     "1",            IDC_SELECT_TAB_0,           VIRTKEY, CONTROL
     VK_NUMPAD1,     IDC_SELECT_TAB_0,           VIRTKEY, CONTROL
     "2",            IDC_SELECT_TAB_1,           VIRTKEY, CONTROL
@@ -124,11 +124,11 @@ BEGIN
     VK_OEM_MINUS,   IDC_ZOOM_MINUS,             VIRTKEY, CONTROL
     VK_OEM_MINUS,   IDC_ZOOM_MINUS,             VIRTKEY, CONTROL, SHIFT
     VK_SUBTRACT,    IDC_ZOOM_MINUS,             VIRTKEY, CONTROL
+    "0",            IDC_ZOOM_NORMAL,            VIRTKEY, CONTROL
+    VK_NUMPAD0,     IDC_ZOOM_NORMAL,            VIRTKEY, CONTROL
     VK_OEM_PLUS,    IDC_ZOOM_PLUS,              VIRTKEY, CONTROL
     VK_OEM_PLUS,    IDC_ZOOM_PLUS,              VIRTKEY, CONTROL, SHIFT
     VK_ADD,         IDC_ZOOM_PLUS,              VIRTKEY, CONTROL
-    "0",            IDC_ZOOM_NORMAL,            VIRTKEY, CONTROL
-    VK_NUMPAD0,     IDC_ZOOM_NORMAL,            VIRTKEY, CONTROL
 END