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, 158 insertions, 145 deletions

diff --git a/chrome/app/chrome_dll_resource.h b/chrome/app/chrome_dll_resource.h
index edc7539..a1f6df5 100644
--- a/chrome/app/chrome_dll_resource.h
+++ b/chrome/app/chrome_dll_resource.h
@@ -2,14 +2,21 @@
 // Microsoft Visual C++ generated include file.
 // Used by chrome_dll.rc
 //
+
 #define IDR_MAINFRAME                   101
+
 // Values around 200 are used by browser/browser_resources.h
 // Values around 300 are used by common/common_resources.h
 // Values around 400 are used by common/net/net_resources.h
 // Values around 500 are used by renderer/renderer_resources.h
+
+#define IDR_SAD_PLUGIN                  1000
+
 // Values around 1600 are used by installer/setup/build/
 // Values around 2000 are used by webkit/glue/webkit_resources.h
+
 #define IDD_IPC_SETTINGS                3000
+
 #define IDC_View                        4000
 #define IDC_ViewHost                    4001
 #define IDC_Plugin                      4002
@@ -27,151 +34,157 @@
 #define IDC_NPObjectNone                4014
 #define IDC_PluginHostAll               4015
 #define IDC_PluginHostNone              4016
-#define IDC_BACK                        32768
-#define IDC_FORWARD                     32769
-#define IDC_STOP                        32770
-#define IDC_RELOAD                      32771
-#define IDC_GO                          32772
-#define IDC_NEW_TAB                     32773
-#define IDC_CLOSE_TAB                   32774
-#define IDC_NEW_WINDOW                  32775
-#define IDC_CLOSE_WINDOW                32776
-#define IDC_FOCUS_LOCATION              32777
-#define IDC_FOCUS_SEARCH                32778
-#define IDC_STAR                        32779
-#define IDC_OPEN_CURRENT_URL            32780
-#define IDC_FIND                        32781
-#define IDC_FIND_NEXT                   32782
-#define IDC_FIND_PREVIOUS               32783
-#define IDC_CUT                         32784
-#define IDC_COPY                        32785
-#define IDC_PASTE                       32786
-#define IDC_SAVE_PAGE                   32787
-#define IDC_PRINT                       32788
-#define IDC_VIEW_SOURCE                 32789
-#define IDC_SELECT_NEXT_TAB             32790
-#define IDC_SELECT_PREVIOUS_TAB         32791
-#define IDC_SELECT_TAB_0                32792
-#define IDC_SELECT_TAB_1                32793
-#define IDC_SELECT_TAB_2                32794
-#define IDC_SELECT_TAB_3                32795
-#define IDC_SELECT_TAB_4                32796
-#define IDC_SELECT_TAB_5                32797
-#define IDC_SELECT_TAB_6                32798
-#define IDC_SELECT_TAB_7                32799
-#define IDC_SELECT_LAST_TAB             32800
-#define IDC_CREATE_SHORTCUTS            32801
-// Free space 32802 - 32804
-#define IDC_EDIT_SEARCH_ENGINES         32805
-#define IDC_ZOOM_PLUS                   32806
-#define IDC_ZOOM_MINUS                  32807
-#define IDC_ZOOM_NORMAL                 32808
-#define IDC_OPEN_FILE                   32809
-#define IDC_ZOOM_MENU                   32810
-#define IDC_TASK_MANAGER                32812
-#define IDC_CLOSE_POPUPS                32813
-#define IDC_ALWAYS_ON_TOP               32814
-#define IDC_COPY_URL                    32815
-#define IDC_JS_CONSOLE                  32816
-#define IDC_DUPLICATE_TAB               32817
-#define IDC_NEW_INCOGNITO_WINDOW        32818
-#define IDC_VIEW_PASSWORDS              32819
-// Free space 32820
-#define IDC_SHOW_DOWNLOADS              32821
-#define IDC_HOME                        32822
-#define IDC_SHOW_HISTORY                32823
-#define IDC_FOCUS_TOOLBAR               32825
-#define IDC_CLEAR_BROWSING_DATA         32826
-// Free space 32827
-#define IDC_APPMENU                     32828
-#define IDC_ABOUT                       32829
-#define IDC_IMPORT_SETTINGS             32830
-#define IDC_OPTIONS                     32831
-#define IDC_REPORT_BUG                  32832
-// Free space 32833 - 32890
-#define IDC_ENCODING_MENU               32891
-#define IDC_ENCODING_AUTO_DETECT        32892
-#define IDC_ENCODING_UTF8               32893
-#define IDC_ENCODING_UTF16LE            32894
-#define IDC_ENCODING_ISO88591           32895
-#define IDC_ENCODING_WINDOWS1252        32896
-#define IDC_ENCODING_GB2312             32897
-#define IDC_ENCODING_GB18030            32898
-#define IDC_ENCODING_BIG5               32899
-#define IDC_ENCODING_BIG5HKSCS          32900
-#define IDC_ENCODING_KOREAN             32901
-#define IDC_ENCODING_SHIFTJIS           32902
-#define IDC_ENCODING_ISO2022JP          32903
-#define IDC_ENCODING_EUCJP              32904
-#define IDC_ENCODING_THAI               32905
-#define IDC_ENCODING_ISO885915          32906
-#define IDC_ENCODING_MACINTOSH          32907
-#define IDC_ENCODING_ISO88592           32908
-#define IDC_ENCODING_WINDOWS1250        32909
-#define IDC_ENCODING_ISO88595           32910
-#define IDC_ENCODING_WINDOWS1251        32911
-#define IDC_ENCODING_KOI8R              32912
-#define IDC_ENCODING_KOI8U              32913
-#define IDC_ENCODING_ISO88597           32914
-#define IDC_ENCODING_WINDOWS1253        32915
-#define IDC_ENCODING_ISO88594           32916
-#define IDC_ENCODING_ISO885913          32917
-#define IDC_ENCODING_WINDOWS1257        32918
-#define IDC_ENCODING_ISO88593           32919
-#define IDC_ENCODING_ISO885910          32920
-#define IDC_ENCODING_ISO885914          32921
-#define IDC_ENCODING_ISO885916          32922
-#define IDC_ENCODING_WINDOWS1254        32923
-#define IDC_ENCODING_ISO88596           32924
-#define IDC_ENCODING_WINDOWS1256        32925
-#define IDC_ENCODING_ISO88598           32926
-#define IDC_ENCODING_WINDOWS1255        32927
-#define IDC_ENCODING_WINDOWS1258        32928
-// Free space 32929
-// Spell-check suggestions.
-// If more suggestions have to be inserted, insert them before the _LAST
-// These have to be consecutive.
-#define IDC_SPELLCHECK_SUGGESTION_0     32930
-#define IDC_SPELLCHECK_SUGGESTION_1     32931
-#define IDC_SPELLCHECK_SUGGESTION_2     32932
-#define IDC_SPELLCHECK_SUGGESTION_3     32933
-#define IDC_SPELLCHECK_SUGGESTION_4     32934
-// We leave some empty room here (35-39) in case we need to grow.
-#define IDC_SPELLCHECK_SUGGESTION_LAST  IDC_SPELLCHECK_SUGGESTION_4
-#define IDC_RESTORE_TAB                 32940
-#define IDC_SHOW_AS_TAB                 32941
-#define IDC_EXIT                        32942
-#define IDC_DEBUGGER                    32943
-#define IDC_DEVELOPER_MENU              32944
-#define IDC_HELP_PAGE                   32945
-#define IDC_SHOW_BOOKMARK_BAR           32946
-// Free space 32947 - 32950
-#define IDR_SAD_PLUGIN                  32951
-#define IDC_SHOW_BOOKMARK_MANAGER       32952
-#define IDC_SPELLCHECK_MENU             32953
-// Reserve space for 100 Spell Check languages - currently we have 30.
-#define IDC_SPELLCHECK_LANGUAGES_FIRST  32954
-#define IDC_SPELLCHECK_LANGUAGES_LAST   33054
-// We have a menu item for opening a new window in a specific profile, and it
-// has dynamic number of sub menu items. The number of sub menu items depends on
-// the number of existing profiles. But we only show menu items for nine
-// different profiles, plus a menu item for other than the nine profiles (if
-// there are more than nine profiles), plus a menu item for new profile.
-#define IDC_PROFILE_MENU                33055
-#define IDC_SELECT_PROFILE              33056
-#define IDC_NEW_PROFILE                 33057
-// Define menu IDs for nine profiles to provide accelarators like CTRL +
-// SHIFT + 1, CTRL + SHIFT + 2, etc. for them.
-#define IDC_NEW_WINDOW_PROFILE_0        33058
-#define IDC_NEW_WINDOW_PROFILE_1        33059
-#define IDC_NEW_WINDOW_PROFILE_2        33060
-#define IDC_NEW_WINDOW_PROFILE_3        33061
-#define IDC_NEW_WINDOW_PROFILE_4        33062
-#define IDC_NEW_WINDOW_PROFILE_5        33063
-#define IDC_NEW_WINDOW_PROFILE_6        33064
-#define IDC_NEW_WINDOW_PROFILE_7        33065
-#define IDC_NEW_WINDOW_PROFILE_8        33066
+
+// NOTE: Within each of the following sections, the IDs are ordered roughly by
+// how they appear in the GUI/menus (left to right, top to bottom, etc.).
+
+// Navigation commands
+#define IDC_BACK                        33000
+#define IDC_FORWARD                     33001
+#define IDC_RELOAD                      33002
+#define IDC_HOME                        33003
+#define IDC_OPEN_CURRENT_URL            33004
+#define IDC_GO                          33005
+#define IDC_STOP                        33006
+
+// Window management commands
+#define IDC_NEW_WINDOW                  34000
+#define IDC_NEW_INCOGNITO_WINDOW        34001
+#define IDC_PROFILE_MENU                34002
+// Insert any additional profile values before _LAST; these have to be
+// consecutive.
+#define IDC_NEW_WINDOW_PROFILE_0        34003
+#define IDC_NEW_WINDOW_PROFILE_1        34004
+#define IDC_NEW_WINDOW_PROFILE_2        34005
+#define IDC_NEW_WINDOW_PROFILE_3        34006
+#define IDC_NEW_WINDOW_PROFILE_4        34007
+#define IDC_NEW_WINDOW_PROFILE_5        34008
+#define IDC_NEW_WINDOW_PROFILE_6        34009
+#define IDC_NEW_WINDOW_PROFILE_7        34010
+#define IDC_NEW_WINDOW_PROFILE_8        34011
 #define IDC_NEW_WINDOW_PROFILE_LAST     IDC_NEW_WINDOW_PROFILE_8
+#define IDC_CLOSE_WINDOW                34012
+#define IDC_ALWAYS_ON_TOP               34013
+#define IDC_NEW_TAB                     34014
+#define IDC_CLOSE_TAB                   34015
+#define IDC_SELECT_NEXT_TAB             34016
+#define IDC_SELECT_PREVIOUS_TAB         34017
+#define IDC_SELECT_TAB_0                34018
+#define IDC_SELECT_TAB_1                34019
+#define IDC_SELECT_TAB_2                34020
+#define IDC_SELECT_TAB_3                34021
+#define IDC_SELECT_TAB_4                34022
+#define IDC_SELECT_TAB_5                34023
+#define IDC_SELECT_TAB_6                34024
+#define IDC_SELECT_TAB_7                34025
+#define IDC_SELECT_LAST_TAB             34026
+#define IDC_DUPLICATE_TAB               34027
+#define IDC_RESTORE_TAB                 34028
+#define IDC_SHOW_AS_TAB                 34029
+#define IDC_EXIT                        34030
+
+// Page-related commands
+#define IDC_STAR                        35000
+#define IDC_VIEW_SOURCE                 35001
+#define IDC_CLOSE_POPUPS                35002
+#define IDC_PRINT                       35003
+#define IDC_SAVE_PAGE                   35004
+#define IDC_ENCODING_MENU               35005
+#define IDC_ENCODING_AUTO_DETECT        35006
+#define IDC_ENCODING_UTF8               35007
+#define IDC_ENCODING_UTF16LE            35008
+#define IDC_ENCODING_ISO88591           35009
+#define IDC_ENCODING_WINDOWS1252        35010
+#define IDC_ENCODING_GB2312             35011
+#define IDC_ENCODING_GB18030            35012
+#define IDC_ENCODING_BIG5               35013
+#define IDC_ENCODING_BIG5HKSCS          35014
+#define IDC_ENCODING_KOREAN             35015
+#define IDC_ENCODING_SHIFTJIS           35016
+#define IDC_ENCODING_ISO2022JP          35017
+#define IDC_ENCODING_EUCJP              35018
+#define IDC_ENCODING_THAI               35019
+#define IDC_ENCODING_ISO885915          35020
+#define IDC_ENCODING_MACINTOSH          35021
+#define IDC_ENCODING_ISO88592           35022
+#define IDC_ENCODING_WINDOWS1250        35023
+#define IDC_ENCODING_ISO88595           35024
+#define IDC_ENCODING_WINDOWS1251        35025
+#define IDC_ENCODING_KOI8R              35026
+#define IDC_ENCODING_KOI8U              35027
+#define IDC_ENCODING_ISO88597           35028
+#define IDC_ENCODING_WINDOWS1253        35029
+#define IDC_ENCODING_ISO88594           35030
+#define IDC_ENCODING_ISO885913          35031
+#define IDC_ENCODING_WINDOWS1257        35032
+#define IDC_ENCODING_ISO88593           35033
+#define IDC_ENCODING_ISO885910          35034
+#define IDC_ENCODING_ISO885914          35035
+#define IDC_ENCODING_ISO885916          35036
+#define IDC_ENCODING_WINDOWS1254        35037
+#define IDC_ENCODING_ISO88596           35038
+#define IDC_ENCODING_WINDOWS1256        35039
+#define IDC_ENCODING_ISO88598           35040
+#define IDC_ENCODING_WINDOWS1255        35041
+#define IDC_ENCODING_WINDOWS1258        35042
+
+// Clipboard commands
+#define IDC_CUT                         36000
+#define IDC_COPY                        36001
+#define IDC_COPY_URL                    36002
+#define IDC_PASTE                       36003
+
+// Find-in-page
+#define IDC_FIND                        37000
+#define IDC_FIND_NEXT                   37001
+#define IDC_FIND_PREVIOUS               37002
+
+// Zoom
+#define IDC_ZOOM_MENU                   38000
+#define IDC_ZOOM_PLUS                   38001
+#define IDC_ZOOM_NORMAL                 38002
+#define IDC_ZOOM_MINUS                  38003
+
+// Focus various bits of UI
+#define IDC_FOCUS_TOOLBAR               39000
+#define IDC_FOCUS_LOCATION              39001
+#define IDC_FOCUS_SEARCH                39002
+
+// Show various bits of UI
+#define IDC_OPEN_FILE                   40000
+#define IDC_CREATE_SHORTCUTS            40001
+#define IDC_DEVELOPER_MENU              40002
+#define IDC_DEBUGGER                    40003
+#define IDC_JS_CONSOLE                  40004
+#define IDC_TASK_MANAGER                40005
+#define IDC_SELECT_PROFILE              40006
+#define IDC_NEW_PROFILE                 40007
+#define IDC_REPORT_BUG                  40008
+#define IDC_SHOW_BOOKMARK_BAR           40009
+#define IDC_SHOW_HISTORY                40010
+#define IDC_SHOW_BOOKMARK_MANAGER       40011
+#define IDC_SHOW_DOWNLOADS              40012
+#define IDC_CLEAR_BROWSING_DATA         40013
+#define IDC_IMPORT_SETTINGS             40014
+#define IDC_OPTIONS                     40015
+#define IDC_EDIT_SEARCH_ENGINES         40016
+#define IDC_VIEW_PASSWORDS              40017
+#define IDC_ABOUT                       40018
+#define IDC_HELP_PAGE                   40019
+
+// Spell-check
+// Insert any additional suggestions before _LAST; these have to be consecutive.
+#define IDC_SPELLCHECK_SUGGESTION_0     41000
+#define IDC_SPELLCHECK_SUGGESTION_1     41001
+#define IDC_SPELLCHECK_SUGGESTION_2     41002
+#define IDC_SPELLCHECK_SUGGESTION_3     41003
+#define IDC_SPELLCHECK_SUGGESTION_4     41004
+#define IDC_SPELLCHECK_SUGGESTION_LAST  IDC_SPELLCHECK_SUGGESTION_4
+#define IDC_SPELLCHECK_MENU             41005
+// Language entries are inserted using autogenerated values between
+// [_FIRST, _LAST).
+#define IDC_SPELLCHECK_LANGUAGES_FIRST  41006
+#define IDC_SPELLCHECK_LANGUAGES_LAST   41106
 
 // Next default values for new objects
 //
@@ -179,7 +192,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NO_MFC                     1
 #define _APS_NEXT_RESOURCE_VALUE        3001
-#define _APS_NEXT_COMMAND_VALUE         33067
+#define _APS_NEXT_COMMAND_VALUE         42000
 #define _APS_NEXT_CONTROL_VALUE         4017
 #define _APS_NEXT_SYMED_VALUE           1001
 #endif