Clean up theme_resources.grd:

* Remove unreferenced identifiers
* A few alphebetization/sorting/commenting issues

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3002001

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

51 files changed, 24 insertions, 79 deletions

diff --git a/chrome/app/theme/arrow_right.png b/chrome/app/theme/arrow_right.png
deleted file mode 100644
index a93c554..0000000
--- a/chrome/app/theme/arrow_right.png
+++ /dev/null
diff --git a/chrome/app/theme/balloon_frame.png b/chrome/app/theme/balloon_frame.png
deleted file mode 100644
index 30568cf..0000000
--- a/chrome/app/theme/balloon_frame.png
+++ /dev/null
diff --git a/chrome/app/theme/balloon_options_arrow.png b/chrome/app/theme/balloon_options_arrow.png
deleted file mode 100644
index b0d0b77..0000000
--- a/chrome/app/theme/balloon_options_arrow.png
+++ /dev/null
diff --git a/chrome/app/theme/balloon_options_arrow_hover.png b/chrome/app/theme/balloon_options_arrow_hover.png
deleted file mode 100644
index 70b586e..0000000
--- a/chrome/app/theme/balloon_options_arrow_hover.png
+++ /dev/null
diff --git a/chrome/app/theme/balloon_shelf.png b/chrome/app/theme/balloon_shelf.png
deleted file mode 100644
index 8b07c29..0000000
--- a/chrome/app/theme/balloon_shelf.png
+++ /dev/null
diff --git a/chrome/app/theme/bookmark_manager_recent.png b/chrome/app/theme/bookmark_manager_recent.png
deleted file mode 100644
index 7b0edf7..0000000
--- a/chrome/app/theme/bookmark_manager_recent.png
+++ /dev/null
diff --git a/chrome/app/theme/bookmark_manager_search.png b/chrome/app/theme/bookmark_manager_search.png
deleted file mode 100644
index 09a85fa..0000000
--- a/chrome/app/theme/bookmark_manager_search.png
+++ /dev/null
diff --git a/chrome/app/theme/chromium/login_background.png b/chrome/app/theme/chromium/login_background.png
deleted file mode 100644
index 507e190..0000000
--- a/chrome/app/theme/chromium/login_background.png
+++ /dev/null
diff --git a/chrome/app/theme/chromium/login_panel.png b/chrome/app/theme/chromium/login_panel.png
deleted file mode 100644
index 9e0dd94..0000000
--- a/chrome/app/theme/chromium/login_panel.png
+++ /dev/null
diff --git a/chrome/app/theme/content_star_d.png b/chrome/app/theme/content_star_d.png
deleted file mode 100644
index 4a34427..0000000
--- a/chrome/app/theme/content_star_d.png
+++ /dev/null
diff --git a/chrome/app/theme/content_star_off.png b/chrome/app/theme/content_star_off.png
deleted file mode 100644
index 5c31249..0000000
--- a/chrome/app/theme/content_star_off.png
+++ /dev/null
diff --git a/chrome/app/theme/content_star_on.png b/chrome/app/theme/content_star_on.png
deleted file mode 100644
index 4fd0aa41..0000000
--- a/chrome/app/theme/content_star_on.png
+++ /dev/null
diff --git a/chrome/app/theme/download_icon.png b/chrome/app/theme/download_icon.png
deleted file mode 100644
index 460602a..0000000
--- a/chrome/app/theme/download_icon.png
+++ /dev/null
diff --git a/chrome/app/theme/drop.png b/chrome/app/theme/drop.png
deleted file mode 100644
index c40f88e..0000000
--- a/chrome/app/theme/drop.png
+++ /dev/null
diff --git a/chrome/app/theme/drop_h.png b/chrome/app/theme/drop_h.png
deleted file mode 100644
index c40f88e..0000000
--- a/chrome/app/theme/drop_h.png
+++ /dev/null
diff --git a/chrome/app/theme/drop_p.png b/chrome/app/theme/drop_p.png
deleted file mode 100644
index c40f88e..0000000
--- a/chrome/app/theme/drop_p.png
+++ /dev/null
diff --git a/chrome/app/theme/expand_arrow_down.png b/chrome/app/theme/expand_arrow_down.png
deleted file mode 100644
index e84223a..0000000
--- a/chrome/app/theme/expand_arrow_down.png
+++ /dev/null
diff --git a/chrome/app/theme/expand_arrow_right.png b/chrome/app/theme/expand_arrow_right.png
deleted file mode 100644
index 0bd2304..0000000
--- a/chrome/app/theme/expand_arrow_right.png
+++ /dev/null
diff --git a/chrome/app/theme/filebrowse_forward.png b/chrome/app/theme/filebrowse_forward.png
deleted file mode 100644
index efe0290..0000000
--- a/chrome/app/theme/filebrowse_forward.png
+++ /dev/null
diff --git a/chrome/app/theme/filebrowse_upload.png b/chrome/app/theme/filebrowse_upload.png
deleted file mode 100644
index cb9e0ab..0000000
--- a/chrome/app/theme/filebrowse_upload.png
+++ /dev/null
diff --git a/chrome/app/theme/find_dlg_left_bb_bg.png b/chrome/app/theme/find_dlg_left_bb_bg.png
deleted file mode 100644
index ed1f475..0000000
--- a/chrome/app/theme/find_dlg_left_bb_bg.png
+++ /dev/null
diff --git a/chrome/app/theme/find_dlg_middle_bb_bg.png b/chrome/app/theme/find_dlg_middle_bb_bg.png
deleted file mode 100644
index 4dc6262..0000000
--- a/chrome/app/theme/find_dlg_middle_bb_bg.png
+++ /dev/null
diff --git a/chrome/app/theme/find_dlg_right_bb_bg.png b/chrome/app/theme/find_dlg_right_bb_bg.png
deleted file mode 100644
index 1d3101c..0000000
--- a/chrome/app/theme/find_dlg_right_bb_bg.png
+++ /dev/null
diff --git a/chrome/app/theme/icon_app.png b/chrome/app/theme/icon_app.png
deleted file mode 100644
index fd4a732..0000000
--- a/chrome/app/theme/icon_app.png
+++ /dev/null
diff --git a/chrome/app/theme/icon_webpage.png b/chrome/app/theme/icon_webpage.png
deleted file mode 100644
index 79cf9c2..0000000
--- a/chrome/app/theme/icon_webpage.png
+++ /dev/null
diff --git a/chrome/app/theme/mediaplayer_menu.png b/chrome/app/theme/mediaplayer_menu.png
deleted file mode 100644
index a262d90..0000000
--- a/chrome/app/theme/mediaplayer_menu.png
+++ /dev/null
diff --git a/chrome/app/theme/menu_marker.png b/chrome/app/theme/menu_marker.png
deleted file mode 100644
index ca67647..0000000
--- a/chrome/app/theme/menu_marker.png
+++ /dev/null
diff --git a/chrome/app/theme/notification_network_open.png b/chrome/app/theme/notification_network_open.png
deleted file mode 100644
index f809a6c..0000000
--- a/chrome/app/theme/notification_network_open.png
+++ /dev/null
diff --git a/chrome/app/theme/notification_network_warning.png b/chrome/app/theme/notification_network_warning.png
deleted file mode 100644
index 5643b193..0000000
--- a/chrome/app/theme/notification_network_warning.png
+++ /dev/null
diff --git a/chrome/app/theme/ntp_extensions_promo.png b/chrome/app/theme/ntp_extensions_promo.png
deleted file mode 100644
index 9c0e56e..0000000
--- a/chrome/app/theme/ntp_extensions_promo.png
+++ /dev/null
diff --git a/chrome/app/theme/ntp_list_off.png b/chrome/app/theme/ntp_list_off.png
deleted file mode 100644
index 070e751..0000000
--- a/chrome/app/theme/ntp_list_off.png
+++ /dev/null
diff --git a/chrome/app/theme/ntp_list_off_h.png b/chrome/app/theme/ntp_list_off_h.png
deleted file mode 100644
index f69ab37..0000000
--- a/chrome/app/theme/ntp_list_off_h.png
+++ /dev/null
diff --git a/chrome/app/theme/ntp_list_off_p.png b/chrome/app/theme/ntp_list_off_p.png
deleted file mode 100644
index b053dd4..0000000
--- a/chrome/app/theme/ntp_list_off_p.png
+++ /dev/null
diff --git a/chrome/app/theme/ntp_list_on.png b/chrome/app/theme/ntp_list_on.png
deleted file mode 100644
index 307ed19..0000000
--- a/chrome/app/theme/ntp_list_on.png
+++ /dev/null
diff --git a/chrome/app/theme/ntp_list_on_h.png b/chrome/app/theme/ntp_list_on_h.png
deleted file mode 100644
index 05e885a..0000000
--- a/chrome/app/theme/ntp_list_on_h.png
+++ /dev/null
diff --git a/chrome/app/theme/ntp_list_on_p.png b/chrome/app/theme/ntp_list_on_p.png
deleted file mode 100644
index 51e3dce..0000000
--- a/chrome/app/theme/ntp_list_on_p.png
+++ /dev/null
diff --git a/chrome/app/theme/ntp_thumb_off.png b/chrome/app/theme/ntp_thumb_off.png
deleted file mode 100644
index e1c054d..0000000
--- a/chrome/app/theme/ntp_thumb_off.png
+++ /dev/null
diff --git a/chrome/app/theme/ntp_thumb_off_h.png b/chrome/app/theme/ntp_thumb_off_h.png
deleted file mode 100644
index d8c2116..0000000
--- a/chrome/app/theme/ntp_thumb_off_h.png
+++ /dev/null
diff --git a/chrome/app/theme/ntp_thumb_off_p.png b/chrome/app/theme/ntp_thumb_off_p.png
deleted file mode 100644
index f35291e..0000000
--- a/chrome/app/theme/ntp_thumb_off_p.png
+++ /dev/null
diff --git a/chrome/app/theme/ntp_thumb_on.png b/chrome/app/theme/ntp_thumb_on.png
deleted file mode 100644
index dfa17c8..0000000
--- a/chrome/app/theme/ntp_thumb_on.png
+++ /dev/null
diff --git a/chrome/app/theme/ntp_thumb_on_h.png b/chrome/app/theme/ntp_thumb_on_h.png
deleted file mode 100644
index 38b6dcd..0000000
--- a/chrome/app/theme/ntp_thumb_on_h.png
+++ /dev/null
diff --git a/chrome/app/theme/ntp_thumb_on_p.png b/chrome/app/theme/ntp_thumb_on_p.png
deleted file mode 100644
index 81ad9f9..0000000
--- a/chrome/app/theme/ntp_thumb_on_p.png
+++ /dev/null
diff --git a/chrome/app/theme/ntp_x_icon.png b/chrome/app/theme/ntp_x_icon.png
deleted file mode 100644
index 1fcc1a4..0000000
--- a/chrome/app/theme/ntp_x_icon.png
+++ /dev/null
diff --git a/chrome/app/theme/ntp_x_icon_active.png b/chrome/app/theme/ntp_x_icon_active.png
deleted file mode 100644
index ac50454..0000000
--- a/chrome/app/theme/ntp_x_icon_active.png
+++ /dev/null
diff --git a/chrome/app/theme/ntp_x_icon_hover.png b/chrome/app/theme/ntp_x_icon_hover.png
deleted file mode 100644
index 466ada1..0000000
--- a/chrome/app/theme/ntp_x_icon_hover.png
+++ /dev/null
diff --git a/chrome/app/theme/ntp_x_icon_small.png b/chrome/app/theme/ntp_x_icon_small.png
deleted file mode 100644
index 5c725ae..0000000
--- a/chrome/app/theme/ntp_x_icon_small.png
+++ /dev/null
diff --git a/chrome/app/theme/sidetabs_shadow_bottom.png b/chrome/app/theme/sidetabs_shadow_bottom.png
deleted file mode 100644
index 5dba711..0000000
--- a/chrome/app/theme/sidetabs_shadow_bottom.png
+++ /dev/null
diff --git a/chrome/app/theme/sidetabs_shadow_middle.png b/chrome/app/theme/sidetabs_shadow_middle.png
deleted file mode 100644
index ee7c45c..0000000
--- a/chrome/app/theme/sidetabs_shadow_middle.png
+++ /dev/null
diff --git a/chrome/app/theme/sidetabs_shadow_top.png b/chrome/app/theme/sidetabs_shadow_top.png
deleted file mode 100644
index 4ac3d70..0000000
--- a/chrome/app/theme/sidetabs_shadow_top.png
+++ /dev/null
diff --git a/chrome/app/theme/statusbar_network_bars0b.png b/chrome/app/theme/statusbar_network_bars0b.png
deleted file mode 100644
index 3e26c65..0000000
--- a/chrome/app/theme/statusbar_network_bars0b.png
+++ /dev/null
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index 8275286..26d66c6 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -22,18 +22,13 @@
         <include name="IDR_ABOUT_BACKGROUND_RTL" file="chromium/about_background_rtl.png" type="BINDATA" />
       </if>
       <include name="IDR_APP_DROPARROW" file="app_droparrow.png" type="BINDATA" />
-      <include name="IDR_ARROW_RIGHT" file="arrow_right.png" type="BINDATA" />
       <include name="IDR_BACK" file="back.png" type="BINDATA" />
       <include name="IDR_BACK_D" file="back_d.png" type="BINDATA" />
       <include name="IDR_BACK_H" file="back_h.png" type="BINDATA" />
       <include name="IDR_BACK_MASK" file="back_mask.png" type="BINDATA" />
       <include name="IDR_BACK_P" file="back_p.png" type="BINDATA" />
-      <include name="IDR_BALLOON_BORDER" file="balloon_frame.png" type="BINDATA" />
       <include name="IDR_BALLOON_CLOSE" file="balloon_close.png" type="BINDATA" />
       <include name="IDR_BALLOON_CLOSE_HOVER" file="balloon_close_hover.png" type="BINDATA" />
-      <include name="IDR_BALLOON_OPTIONS_ARROW" file="balloon_options_arrow.png" type="BINDATA" />
-      <include name="IDR_BALLOON_OPTIONS_ARROW_HOVER" file="balloon_options_arrow_hover.png" type="BINDATA" />
-      <include name="IDR_BALLOON_SHELF" file="balloon_shelf.png" type="BINDATA" />
       <include name="IDR_BALLOON_WRENCH" file="balloon_wrench.png" type="BINDATA" />
       <include name="IDR_BALLOON_WRENCH_HOVER" file="balloon_wrench_hover.png" type="BINDATA" />
       <include name="IDR_BLOCKED_COOKIES" file="blocked_cookies.png" type="BINDATA" />
@@ -49,8 +44,6 @@
       <if expr="os == 'darwin'">
         <include name="IDR_BOOKMARK_BAR_FOLDER" file="bookmark_bar_folder_mac.png" type="BINDATA" />
       </if>
-      <include name="IDR_BOOKMARK_MANAGER_RECENT_ICON" file="bookmark_manager_recent.png" type="BINDATA" />
-      <include name="IDR_BOOKMARK_MANAGER_SEARCH_ICON" file="bookmark_manager_search.png" type="BINDATA" />
       <include name="IDR_BUBBLE_B" file="bubble_b.png" type="BINDATA" />
       <include name="IDR_BUBBLE_BL" file="bubble_bl.png" type="BINDATA" />
       <include name="IDR_BUBBLE_BR" file="bubble_br.png" type="BINDATA" />
@@ -77,9 +70,6 @@
       <include name="IDR_CONSTRAINED_TOP_CENTER_V" file="constrained_top_center_v.png" type="BINDATA" />
       <include name="IDR_CONSTRAINED_TOP_LEFT_CORNER_V" file="constrained_top_left_corner_v.png" type="BINDATA" />
       <include name="IDR_CONSTRAINED_TOP_RIGHT_CORNER_V" file="constrained_top_right_corner_v.png" type="BINDATA" />
-      <include name="IDR_CONTENT_STAR_D" file="content_star_d.png" type="BINDATA" />
-      <include name="IDR_CONTENT_STAR_OFF" file="content_star_off.png" type="BINDATA" />
-      <include name="IDR_CONTENT_STAR_ON" file="content_star_on.png" type="BINDATA" />
       <include name="IDR_CONTENT_TOP_CENTER" file="content_top_center.png" type="BINDATA" />
       <include name="IDR_CONTENT_TOP_LEFT_CORNER" file="content_top_left_corner.png" type="BINDATA" />
       <include name="IDR_CONTENT_TOP_LEFT_CORNER_MASK" file="content_top_left_corner_mask.png" type="BINDATA" />
@@ -132,16 +122,10 @@
       <include name="IDR_DOWNLOAD_BUTTON_RIGHT_TOP_H" file="download_button_right_top_h.png" type="BINDATA" />
       <include name="IDR_DOWNLOAD_BUTTON_RIGHT_TOP_NO_DD" file="download_button_right_top_no_dd.png" type="BINDATA" />
       <include name="IDR_DOWNLOAD_BUTTON_RIGHT_TOP_P" file="download_button_right_top_p.png" type="BINDATA" />
-      <include name="IDR_DOWNLOAD_ICON" file="download_icon.png" type="BINDATA" />
       <include name="IDR_DOWNLOAD_PROGRESS_BACKGROUND_16" file="download_progress_background16.png" type="BINDATA" />
       <include name="IDR_DOWNLOAD_PROGRESS_BACKGROUND_32" file="download_progress_background32.png" type="BINDATA" />
       <include name="IDR_DOWNLOAD_PROGRESS_FOREGROUND_16" file="download_progress_foreground16.png" type="BINDATA" />
       <include name="IDR_DOWNLOAD_PROGRESS_FOREGROUND_32" file="download_progress_foreground32.png" type="BINDATA" />
-      <include name="IDR_DROP" file="drop.png" type="BINDATA" />
-      <include name="IDR_DROP_H" file="drop_h.png" type="BINDATA" />
-      <include name="IDR_DROP_P" file="drop_p.png" type="BINDATA" />
-      <include name="IDR_EXPAND_ARROW_DOWN_ICON" file="expand_arrow_down.png" type="BINDATA" />
-      <include name="IDR_EXPAND_ARROW_RIGHT_ICON" file="expand_arrow_right.png" type="BINDATA" />
       <include name="IDR_EXTENSIONS_SECTION" file="extensions_section.png" type="BINDATA" />
       <include name="IDR_FINDINPAGE_NEXT" file="find_next.png" type="BINDATA" />
       <include name="IDR_FINDINPAGE_NEXT_H" file="find_next_h.png" type="BINDATA" />
@@ -155,14 +139,9 @@
       <include name="IDR_FIND_DIALOG_LEFT" file="find_dialog_left.png" type="BINDATA" />
       <include name="IDR_FIND_DIALOG_MIDDLE" file="find_dialog_middle.png" type="BINDATA" />
       <include name="IDR_FIND_DIALOG_RIGHT" file="find_dialog_right.png" type="BINDATA" />
-      <!-- The following (IDR_FIND_DLG_[LEFT|RIGHT|MIDDLE]_[BB]_BACKGROUND) are deprecated but are kept around for the Linux port -->
       <include name="IDR_FIND_DLG_LEFT_BACKGROUND" file="find_dlg_left_bg.png" type="BINDATA" />
-      <include name="IDR_FIND_DLG_LEFT_BB_BACKGROUND" file="find_dlg_left_bb_bg.png" type="BINDATA" />
-      <include name="IDR_FIND_DLG_RIGHT_BACKGROUND" file="find_dlg_right_bg.png" type="BINDATA" />
-      <include name="IDR_FIND_DLG_RIGHT_BB_BACKGROUND" file="find_dlg_right_bb_bg.png" type="BINDATA" />
       <include name="IDR_FIND_DLG_MIDDLE_BACKGROUND" file="find_dlg_middle_bg.png" type="BINDATA" />
-      <include name="IDR_FIND_DLG_MIDDLE_BB_BACKGROUND" file="find_dlg_middle_bb_bg.png" type="BINDATA" />
-      <!-- End deprecated files -->
+      <include name="IDR_FIND_DLG_RIGHT_BACKGROUND" file="find_dlg_right_bg.png" type="BINDATA" />
       <include name="IDR_FORWARD" file="forward.png" type="BINDATA" />
       <include name="IDR_FORWARD_D" file="forward_d.png" type="BINDATA" />
       <include name="IDR_FORWARD_H" file="forward_h.png" type="BINDATA" />
@@ -212,7 +191,6 @@
       <include name="IDR_MAXIMIZE_BUTTON_MASK" file="maximize_button_mask.png" type="BINDATA" />
       <include name="IDR_MENU_CHROME" file="menu_chrome.png" type="BINDATA" />
       <include name="IDR_MENU_CHROME_RTL" file="menu_chrome_rtl.png" type="BINDATA" />
-      <include name="IDR_MENU_MARKER" file="menu_marker.png" type="BINDATA" />
       <include name="IDR_MENU_PAGE" file="menu_page.png" type="BINDATA" />
       <include name="IDR_MENU_PAGE_RTL" file="menu_page_rtl.png" type="BINDATA" />
       <include name="IDR_MINIMIZE_BUTTON_MASK" file="minimize_button_mask.png" type="BINDATA" />
@@ -222,41 +200,12 @@
       <include name="IDR_NEWTAB_BUTTON_P" file="newtab_p.png" type="BINDATA" />
       <include name="IDR_NEWTAB_CHROME_WELCOME_PAGE_FAVICON" file="ntp_welcome_favicon.png" type="BINDATA" />
       <include name="IDR_NEWTAB_CHROME_WELCOME_PAGE_THUMBNAIL" file="ntp_welcome_thumb.png" type="BINDATA" />
-      <include name="IDR_NEWTAB_EXTENSIONS_PROMO" file="ntp_extensions_promo.png" type="BINDATA" />
-      <include name="IDR_NEWTAB_LIST_OFF" file="ntp_list_off.png" type="BINDATA" />
-      <include name="IDR_NEWTAB_LIST_OFF_H" file="ntp_list_off_h.png" type="BINDATA" />
-      <include name="IDR_NEWTAB_LIST_OFF_P" file="ntp_list_off_p.png" type="BINDATA" />
-      <include name="IDR_NEWTAB_LIST_ON" file="ntp_list_on.png" type="BINDATA" />
-      <include name="IDR_NEWTAB_LIST_ON_H" file="ntp_list_on_h.png" type="BINDATA" />
-      <include name="IDR_NEWTAB_LIST_ON_P" file="ntp_list_on_p.png" type="BINDATA" />
       <include name="IDR_NEWTAB_MENU_MASK" file="ntp_menu_mask.png" type="BINDATA" />
       <include name="IDR_NEWTAB_OPTION" file="ntp_option.png" type="BINDATA" />
       <include name="IDR_NEWTAB_OPTION_H" file="ntp_option_h.png" type="BINDATA" />
       <include name="IDR_NEWTAB_OPTION_P" file="ntp_option_p.png" type="BINDATA" />
-      <include name="IDR_NEWTAB_REMOVE_ICON" file="ntp_x_icon_small.png" type="BINDATA" />
-      <include name="IDR_NEWTAB_REMOVE_THUMBNAIL" file="ntp_x_icon.png" type="BINDATA" />
-      <include name="IDR_NEWTAB_REMOVE_THUMBNAIL_ACTIVE" file="ntp_x_icon_active.png" type="BINDATA" />
-      <include name="IDR_NEWTAB_REMOVE_THUMBNAIL_HOVER" file="ntp_x_icon_hover.png" type="BINDATA" />
       <include name="IDR_NEWTAB_THEMES_GALLERY_FAVICON" file="ntp_themes_gallery_favicon.png" type="BINDATA" />
       <include name="IDR_NEWTAB_THEMES_GALLERY_THUMBNAIL" file="ntp_themes_gallery_thumb.png" type="BINDATA" />
-      <include name="IDR_NEWTAB_THUMB_OFF" file="ntp_thumb_off.png" type="BINDATA" />
-      <include name="IDR_NEWTAB_THUMB_OFF_H" file="ntp_thumb_off_h.png" type="BINDATA" />
-      <include name="IDR_NEWTAB_THUMB_OFF_P" file="ntp_thumb_off_p.png" type="BINDATA" />
-      <include name="IDR_NEWTAB_THUMB_ON" file="ntp_thumb_on.png" type="BINDATA" />
-      <include name="IDR_NEWTAB_THUMB_ON_H" file="ntp_thumb_on_h.png" type="BINDATA" />
-      <include name="IDR_NEWTAB_THUMB_ON_P" file="ntp_thumb_on_p.png" type="BINDATA" />
-      <if expr="pp_ifdef('_google_chrome')">
-        <include name="IDR_PRODUCT_ICON_32" file="google_chrome/google_chrome_icon_32.png" type="BINDATA" />
-        <include name="IDR_PRODUCT_LOGO" file="google_chrome/product_logo.png" type="BINDATA" />
-        <include name="IDR_PRODUCT_LOGO_16" file="google_chrome/product_logo_16.png" type="BINDATA" />
-        <include name="IDR_PRODUCT_LOGO_WHITE" file="google_chrome/product_logo_white.png" type="BINDATA" />
-      </if>
-      <if expr="not pp_ifdef('_google_chrome')">
-        <include name="IDR_PRODUCT_ICON_32" file="chromium/chromium_icon_32.png" type="BINDATA" />
-        <include name="IDR_PRODUCT_LOGO" file="chromium/product_logo.png" type="BINDATA" />
-        <include name="IDR_PRODUCT_LOGO_16" file="chromium/product_logo_16.png" type="BINDATA" />
-        <include name="IDR_PRODUCT_LOGO_WHITE" file="chromium/product_logo_white.png" type="BINDATA" />
-      </if>
       <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_C" file="omnibox_ev_bubble_background_c.png" type="BINDATA" />
       <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_L" file="omnibox_ev_bubble_background_l.png" type="BINDATA" />
       <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_R" file="omnibox_ev_bubble_background_r.png" type="BINDATA" />
@@ -283,6 +232,21 @@
       <include name="IDR_PAGEINFO_BAD" file="pageinfo_bad.png" type="BINDATA" />
       <include name="IDR_PAGEINFO_GOOD" file="pageinfo_good.png" type="BINDATA" />
       <include name="IDR_PLUGIN" file="plugin.png" type="BINDATA" />
+      <if expr="pp_ifdef('_google_chrome')">
+        <include name="IDR_PRODUCT_ICON_32" file="google_chrome/google_chrome_icon_32.png" type="BINDATA" />
+        <include name="IDR_PRODUCT_LOGO" file="google_chrome/product_logo.png" type="BINDATA" />
+        <include name="IDR_PRODUCT_LOGO_16" file="google_chrome/product_logo_16.png" type="BINDATA" />
+        <include name="IDR_PRODUCT_LOGO_WHITE" file="google_chrome/product_logo_white.png" type="BINDATA" />
+      </if>
+      <if expr="not pp_ifdef('_google_chrome')">
+        <include name="IDR_PRODUCT_ICON_32" file="chromium/chromium_icon_32.png" type="BINDATA" />
+        <include name="IDR_PRODUCT_LOGO" file="chromium/product_logo.png" type="BINDATA" />
+        <include name="IDR_PRODUCT_LOGO_WHITE" file="chromium/product_logo_white.png" type="BINDATA" />
+        <include name="IDR_PRODUCT_LOGO_16" file="chromium/product_logo_16.png" type="BINDATA" />
+      </if>
+      <!-- NOTE: product_logo_*.* files beyond what's listed above are
+           referenced by installer code; don't remove them unless you know what
+           you're doing! -->
       <include name="IDR_RELOAD" file="reload.png" type="BINDATA" />
       <include name="IDR_RELOAD_H" file="reload_h.png" type="BINDATA" />
       <include name="IDR_RELOAD_P" file="reload_p.png" type="BINDATA" />
@@ -319,9 +283,6 @@
         <include name="IDR_SEARCH_ENGINE_LOGO_YANDEX" file="notused.png" type="BINDATA" />
       </if>
       <include name="IDR_SIDETABS_NEW_TAB" file="sidetabs_new_tab.png" type="BINDATA" />
-      <include name="IDR_SIDETABS_SHADOW_BOTTOM" file="sidetabs_shadow_bottom.png" type="BINDATA" />
-      <include name="IDR_SIDETABS_SHADOW_MIDDLE" file="sidetabs_shadow_middle.png" type="BINDATA" />
-      <include name="IDR_SIDETABS_SHADOW_TOP" file="sidetabs_shadow_top.png" type="BINDATA" />
       <if expr="pp_ifdef('_google_chrome') and (os == 'darwin')">
         <include name="IDR_STATUS_TRAY_ICON" file="google_chrome/product_logo_22_mono.png" type="BINDATA" />
         <include name="IDR_STATUS_TRAY_ICON_PRESSED" file="google_chrome/product_logo_22_mono_invert.png" type="BINDATA" />
@@ -445,25 +406,24 @@
         <include name="IDR_INFOBARBUTTON_TOP_RIGHT_P" file="infobarbutton_tr_p.png" type="BINDATA" />
       </if>
 
-      <if expr="pp_ifdef('chromeos')">
-        <include name="IDR_NOTIFICATION_MENU" file="notification_menu.png" type="BINDATA" />
+      <!-- Images only used by GTK. -->
+      <if expr="not pp_ifdef('toolkit_views') and os != 'darwin'">
+        <include name="IDR_OMNIBOX_HISTORY_DARK_TRANSPARENT" file="omnibox_history_dark_transparent.png" type="BINDATA" />
+        <include name="IDR_OMNIBOX_HISTORY_TRANSPARENT" file="omnibox_history_transparent.png" type="BINDATA" />
+        <include name="IDR_OMNIBOX_HTTP_DARK_TRANSPARENT" file="omnibox_http_dark_transparent.png" type="BINDATA" />
+        <include name="IDR_OMNIBOX_HTTP_TRANSPARENT" file="omnibox_http_transparent.png" type="BINDATA" />
       </if>
 
+      <!-- Images only used by ChromeOS. -->
       <if expr="pp_ifdef('chromeos')">
         <include name="IDR_COMPACTNAV_BACK" file="compactnav_back.png" type="BINDATA" />
         <include name="IDR_COMPACTNAV_FORWARD" file="compactnav_forward.png" type="BINDATA" />
         <include name="IDR_COMPACTNAV_SEPARATOR" file="compactnav_separator.png" type="BINDATA" />
-        <include name="IDR_FILEBROWSER_FWD" file="filebrowse_forward.png" type="BINDATA" />
-        <include name="IDR_FILEBROWSER_UPLOAD" file="filebrowse_upload.png" type="BINDATA" />
-        <include name="IDR_ICON_APP" file="icon_app.png" type="BINDATA" />
-        <include name="IDR_ICON_WEBPAGE" file="icon_webpage.png" type="BINDATA" />
         <include name="IDR_LOGIN_DEFAULT_USER" file="login_default.png" type="BINDATA" />
         <include name="IDR_LOGIN_OTHER_USER" file="login_other.png" type="BINDATA" />
-        <include name="IDR_MEDIAPLAYER_MENU" file="mediaplayer_menu.png" type="BINDATA" />
         <include name="IDR_NOTIFICATION_LOW_BATTERY" file="notification_battery_low.png" type="BINDATA" />
+        <include name="IDR_NOTIFICATION_MENU" file="notification_menu.png" type="BINDATA" />
         <include name="IDR_NOTIFICATION_NETWORK_FAILED" file="notification_network_failed.png" type="BINDATA" />
-        <include name="IDR_NOTIFICATION_NETWORK_OPEN" file="notification_network_open.png" type="BINDATA" />
-        <include name="IDR_NOTIFICATION_NETWORK_WARNING" file="notification_network_warning.png" type="BINDATA" />
         <include name="IDR_NOTIFICATION_UPDATE" file="notification_update.png" type="BINDATA" />
         <include name="IDR_SPINNER" file="spinner.png" type="BINDATA" />
         <include name="IDR_STATUSBAR_BATTERY_CHARGED" file="statusbar_battery_charged.png" type="BINDATA" />
@@ -499,7 +459,6 @@
         <include name="IDR_STATUSBAR_MENU" file="statusbar_menu.png" type="BINDATA" />
         <include name="IDR_STATUSBAR_NETWORK_3G" file="statusbar_network_3g.png" type="BINDATA" />
         <include name="IDR_STATUSBAR_NETWORK_BARS0" file="statusbar_network_bars0.png" type="BINDATA" />
-        <include name="IDR_STATUSBAR_NETWORK_BARS0_BLACK" file="statusbar_network_bars0b.png" type="BINDATA" />
         <include name="IDR_STATUSBAR_NETWORK_BARS1" file="statusbar_network_bars1.png" type="BINDATA" />
         <include name="IDR_STATUSBAR_NETWORK_BARS1_BLACK" file="statusbar_network_bars1b.png" type="BINDATA" />
         <include name="IDR_STATUSBAR_NETWORK_BARS2" file="statusbar_network_bars2.png" type="BINDATA" />
@@ -529,20 +488,6 @@
         <include name="IDR_USER_IMAGE_NO_VIDEO" file="login_other.png" type="BINDATA" />
         <include name="IDR_VOLUMEBUBBLE_ICON" file="volume_icon.png" type="BINDATA" />
       </if>
-
-      <if expr="not pp_ifdef('_google_chrome')">
-        <include name="IDR_LOGIN_BACKGROUND" file="chromium/login_background.png" type="BINDATA" />
-        <include name="IDR_LOGIN_PANEL" file="chromium/login_panel.png" type="BINDATA" />
-      </if>
-
-      <if expr="not pp_ifdef('toolkit_views')">
-        <!-- The GTK interface needs these slightly modified images in
-             gtk-theme mode. Other platforms don't need these. -->
-        <include name="IDR_OMNIBOX_HISTORY_TRANSPARENT" file="omnibox_history_transparent.png" type="BINDATA" />
-        <include name="IDR_OMNIBOX_HISTORY_DARK_TRANSPARENT" file="omnibox_history_dark_transparent.png" type="BINDATA" />
-        <include name="IDR_OMNIBOX_HTTP_TRANSPARENT" file="omnibox_http_transparent.png" type="BINDATA" />
-        <include name="IDR_OMNIBOX_HTTP_DARK_TRANSPARENT" file="omnibox_http_dark_transparent.png" type="BINDATA" />
-      </if>
     </includes>
   </release>
 </grit>