Cleanup part 4.

Remove dead/unnecessary resources/identifiers/code.

The trickiest bit of this to review are the browser.cc changes, where various commands are no longer initialized multiple times.
Review URL: http://codereview.chromium.org/13648

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

3 files changed, 51 insertions, 53 deletions

diff --git a/chrome/app/theme/frozen_plugin.png b/chrome/app/theme/frozen_plugin.png
deleted file mode 100644
index 5b50247..0000000
--- a/chrome/app/theme/frozen_plugin.png
+++ /dev/null
diff --git a/chrome/app/theme/theme_resources.h b/chrome/app/theme/theme_resources.h
index 01e0cc6..05f9f06 100644
--- a/chrome/app/theme/theme_resources.h
+++ b/chrome/app/theme/theme_resources.h
@@ -3,7 +3,7 @@
 
 // NOTE: If you change an id you can use the following awk script to
 // regenerate this file with no holes in the ids:
-//   awk '$1 != "#define"{print$0} $1 == "#define" {row++;printf "#define %-48s %d\n", $2, (row+9000)}' < theme_resources.h
+//   awk '$1 != "#define"{print$0} $1 == "#define" {row++;printf "#define %-48s %d\n", $2, (row+8999)}' < theme_resources.h
 
 #define IDR_BACK                                         9000
 #define IDR_BACK_D                                       9001
@@ -267,54 +267,53 @@
 #define IDR_WIZARD_ICON                                  9259
 #define IDR_MENU_MARKER                                  9260
 #define IDR_FROZEN_TAB_ICON                              9261
-#define IDR_FROZEN_PLUGIN_ICON                           9262
-#define IDR_UPDATE_AVAILABLE                             9263
-#define IDR_MENU_PAGE                                    9264
-#define IDR_MENU_CHROME                                  9265
-#define IDR_ABOUT_BACKGROUND_RTL                         9266
-#define IDR_WIZARD_ICON_RTL                              9267
-#define IDR_LOCATIONBG_POPUPMODE_LEFT                    9268
-#define IDR_LOCATIONBG_POPUPMODE_CENTER                  9269
-#define IDR_LOCATIONBG_POPUPMODE_RIGHT                   9270
-#define IDR_CLOSE_SA                                     9271
-#define IDR_CLOSE_SA_H                                   9272
-#define IDR_CLOSE_SA_P                                   9273
-#define IDR_HISTORY_SECTION                              9274
-#define IDR_DOWNLOADS_SECTION                            9275
-#define IDR_DEFAULT_THUMBNAIL                            9276
-#define IDR_THROBBER_WAITING                             9277
-#define IDR_INFOBAR_PLUGIN_CRASHED                       9278
-#define IDR_UPDATE_UPTODATE                              9279
-#define IDR_UPDATE_FAIL                                  9280
-#define IDR_CLOSE_BAR                                    9281
-#define IDR_CLOSE_BAR_H                                  9282
-#define IDR_CLOSE_BAR_P                                  9283
-#define IDR_HOME                                         9284
-#define IDR_HOME_H                                       9285
-#define IDR_HOME_P                                       9286
-#define IDR_FIND_BOX_BACKGROUND_LEFT_RTL                 9287
-#define IDR_INPUT_GOOD                                   9288
-#define IDR_INPUT_ALERT                                  9289
-#define IDR_HISTORY_FAVICON                              9290
-#define IDR_DOWNLOADS_FAVICON                            9291
-#define IDR_MENU_PAGE_RTL                                9292
-#define IDR_MENU_CHROME_RTL                              9293
-#define IDR_DOWNLOAD_ANIMATION_BEGIN                     9294
-#define IDR_TAB_HOVER_LEFT                               9295
-#define IDR_TAB_HOVER_CENTER                             9296
-#define IDR_TAB_HOVER_RIGHT                              9297
-#define IDR_FOLDER_CLOSED_RTL                            9298
-#define IDR_FOLDER_OPEN_RTL                              9299
-#define IDR_BOOKMARK_BAR_FOLDER                          9300
-#define IDR_FIND_DLG_LEFT_BB_BACKGROUND                  9301
-#define IDR_FIND_DLG_RIGHT_BB_BACKGROUND                 9302
-#define IDR_FIND_DLG_MIDDLE_BB_BACKGROUND                9303
-#define IDR_THROBBER_LIGHT                               9304
-#define IDR_OTR_ICON_STANDALONE                          9305
-#define IDR_PRODUCT_LOGO                                 9306
-#define IDR_DISTRIBUTOR_LOGO                             9307
-#define IDR_DISTRIBUTOR_LOGO_LIGHT                       9308
-#define IDR_BOOKMARK_MANAGER_RECENT_ICON                 9309
-#define IDR_BOOKMARK_MANAGER_SEARCH_ICON                 9310
-#define IDR_MENU_DROPARROW                               9311
-#define IDR_ABOUT_BACKGROUND_COLOR                       9312
+#define IDR_UPDATE_AVAILABLE                             9262
+#define IDR_MENU_PAGE                                    9263
+#define IDR_MENU_CHROME                                  9264
+#define IDR_ABOUT_BACKGROUND_RTL                         9265
+#define IDR_WIZARD_ICON_RTL                              9266
+#define IDR_LOCATIONBG_POPUPMODE_LEFT                    9267
+#define IDR_LOCATIONBG_POPUPMODE_CENTER                  9268
+#define IDR_LOCATIONBG_POPUPMODE_RIGHT                   9269
+#define IDR_CLOSE_SA                                     9270
+#define IDR_CLOSE_SA_H                                   9271
+#define IDR_CLOSE_SA_P                                   9272
+#define IDR_HISTORY_SECTION                              9273
+#define IDR_DOWNLOADS_SECTION                            9274
+#define IDR_DEFAULT_THUMBNAIL                            9275
+#define IDR_THROBBER_WAITING                             9276
+#define IDR_INFOBAR_PLUGIN_CRASHED                       9277
+#define IDR_UPDATE_UPTODATE                              9278
+#define IDR_UPDATE_FAIL                                  9279
+#define IDR_CLOSE_BAR                                    9280
+#define IDR_CLOSE_BAR_H                                  9281
+#define IDR_CLOSE_BAR_P                                  9282
+#define IDR_HOME                                         9283
+#define IDR_HOME_H                                       9284
+#define IDR_HOME_P                                       9285
+#define IDR_FIND_BOX_BACKGROUND_LEFT_RTL                 9286
+#define IDR_INPUT_GOOD                                   9287
+#define IDR_INPUT_ALERT                                  9288
+#define IDR_HISTORY_FAVICON                              9289
+#define IDR_DOWNLOADS_FAVICON                            9290
+#define IDR_MENU_PAGE_RTL                                9291
+#define IDR_MENU_CHROME_RTL                              9292
+#define IDR_DOWNLOAD_ANIMATION_BEGIN                     9293
+#define IDR_TAB_HOVER_LEFT                               9294
+#define IDR_TAB_HOVER_CENTER                             9295
+#define IDR_TAB_HOVER_RIGHT                              9296
+#define IDR_FOLDER_CLOSED_RTL                            9297
+#define IDR_FOLDER_OPEN_RTL                              9298
+#define IDR_BOOKMARK_BAR_FOLDER                          9299
+#define IDR_FIND_DLG_LEFT_BB_BACKGROUND                  9300
+#define IDR_FIND_DLG_RIGHT_BB_BACKGROUND                 9301
+#define IDR_FIND_DLG_MIDDLE_BB_BACKGROUND                9302
+#define IDR_THROBBER_LIGHT                               9303
+#define IDR_OTR_ICON_STANDALONE                          9304
+#define IDR_PRODUCT_LOGO                                 9305
+#define IDR_DISTRIBUTOR_LOGO                             9306
+#define IDR_DISTRIBUTOR_LOGO_LIGHT                       9307
+#define IDR_BOOKMARK_MANAGER_RECENT_ICON                 9308
+#define IDR_BOOKMARK_MANAGER_SEARCH_ICON                 9309
+#define IDR_MENU_DROPARROW                               9310
+#define IDR_ABOUT_BACKGROUND_COLOR                       9311
diff --git a/chrome/app/theme/theme_resources.rc b/chrome/app/theme/theme_resources.rc
index ab835ee..572b5da 100644
--- a/chrome/app/theme/theme_resources.rc
+++ b/chrome/app/theme/theme_resources.rc
@@ -262,7 +262,6 @@ IDR_INFO_BUBBLE_CORNER_BOTTOM_LEFT   BINDATA  "bubble_corner_bl.png"
 IDR_INFO_BUBBLE_CORNER_BOTTOM_RIGHT  BINDATA  "bubble_corner_br.png"
 IDR_MENU_MARKER                    BINDATA  "menu_marker.png"
 IDR_FROZEN_TAB_ICON                BINDATA "frozen_tab.png"
-IDR_FROZEN_PLUGIN_ICON             BINDATA "frozen_plugin.png"
 IDR_UPDATE_AVAILABLE               BINDATA "update_available.png"
 IDR_MENU_PAGE                      BINDATA "menu_page.png"
 IDR_MENU_CHROME                    BINDATA "menu_chrome.png"