grd file update for new 2x assets

The grd changes were made by http://pastie.org/4132407 (and
then cleaned up manually).

BUG=132910
TEST=Look at various icons (blocked plugins, "press tab to search", etc)
TBR=sky

Review URL: https://chromiumcodereview.appspot.com/10642014

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

63 files changed, 170 insertions, 158 deletions

diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index 3bb6f14..f039058 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -24,18 +24,9 @@
         <include name="IDR_ABOUT_BACKGROUND_COLOR" file="chromium/about_background_color.png" type="BINDATA" />
         <include name="IDR_ABOUT_BACKGROUND_RTL" file="chromium/about_background_rtl.png" type="BINDATA" />
       </if>
-      <include name="IDR_ACCESSED_COOKIES" file="default_100_percent/accessed_cookies.png" type="BINDATA" />
-      <include name="IDR_APP_DEFAULT_ICON" file="default_100_percent/app_default_icon.png" type="BINDATA" />
-      <include name="IDR_APP_DROPARROW" file="default_100_percent/app_droparrow.png" type="BINDATA" />
       <include name="IDR_BALLOON_CLOSE" file="default_100_percent/balloon_close.png" type="BINDATA" />
       <include name="IDR_BALLOON_CLOSE_HOVER" file="default_100_percent/balloon_close_hover.png" type="BINDATA" />
       <include name="IDR_BOOKMARK_BAR_CHEVRONS" file="default_100_percent/chevron.png" type="BINDATA" />
-      <if expr="not is_macosx">
-        <include name="IDR_BOOKMARK_BAR_FOLDER" file="default_100_percent/bookmark_bar_folder.png" type="BINDATA" />
-      </if>
-      <if expr="is_macosx">
-        <include name="IDR_BOOKMARK_BAR_FOLDER" file="default_100_percent/bookmark_bar_folder_mac.png" type="BINDATA" />
-      </if>
       <include name="IDR_CLOSE_BUTTON_MASK" file="default_100_percent/close_button_mask.png" type="BINDATA" />
       <if expr="is_win">
         <include name="IDR_CONFLICT_BADGE" file="default_100_percent/conflict_badge.png" type="BINDATA" />
@@ -49,15 +40,9 @@
       <include name="IDR_CONSTRAINED_TOP_CENTER_V" file="default_100_percent/constrained_top_center_v.png" type="BINDATA" />
       <include name="IDR_CONSTRAINED_TOP_LEFT_CORNER_V" file="default_100_percent/constrained_top_left_corner_v.png" type="BINDATA" />
       <include name="IDR_CONSTRAINED_TOP_RIGHT_CORNER_V" file="default_100_percent/constrained_top_right_corner_v.png" type="BINDATA" />
-      <include name="IDR_COOKIE_ICON" file="default_100_percent/cookie.png" type="BINDATA" />
-      <include name="IDR_COOKIE_STORAGE_ICON" file="default_100_percent/cookie_storage.png" type="BINDATA" />
-      <include name="IDR_CWS_STAR_EMPTY" file="default_100_percent/cws_star_empty.png" type="BINDATA" />
-      <include name="IDR_CWS_STAR_FULL" file="default_100_percent/cws_star_full.png" type="BINDATA" />
-      <include name="IDR_CWS_STAR_HALF" file="default_100_percent/cws_star_half.png" type="BINDATA" />
       <include name="IDR_DOCK_HIGH" file="default_100_percent/dock_tab_high.png" type="BINDATA" />
       <include name="IDR_DOCK_MAX" file="default_100_percent/dock_tab_max.png" type="BINDATA" />
       <include name="IDR_DOCK_WIDE" file="default_100_percent/dock_tab_wide.png" type="BINDATA" />
-      <include name="IDR_DOWNLOAD_ANIMATION_BEGIN" file="default_100_percent/download_animation_begin.png" type="BINDATA" />
       <include name="IDR_DOWNLOAD_BUTTON_CENTER_BOTTOM" file="default_100_percent/download_button_center_bottom.png" type="BINDATA" />
       <include name="IDR_DOWNLOAD_BUTTON_CENTER_BOTTOM_H" file="default_100_percent/download_button_center_bottom_hover.png" type="BINDATA" />
       <include name="IDR_DOWNLOAD_BUTTON_CENTER_BOTTOM_P" file="default_100_percent/download_button_center_bottom_pressed.png" type="BINDATA" />
@@ -97,18 +82,6 @@
       <include name="IDR_DOWNLOAD_BUTTON_RIGHT_TOP_H" file="default_100_percent/download_button_right_top_hover.png" type="BINDATA" />
       <include name="IDR_DOWNLOAD_BUTTON_RIGHT_TOP_NO_DD" file="default_100_percent/download_button_right_top_no_dd.png" type="BINDATA" />
       <include name="IDR_DOWNLOAD_BUTTON_RIGHT_TOP_P" file="default_100_percent/download_button_right_top_pressed.png" type="BINDATA" />
-      <include name="IDR_DOWNLOAD_PROGRESS_BACKGROUND_16" file="default_100_percent/download_progress_background16.png" type="BINDATA" />
-      <include name="IDR_DOWNLOAD_PROGRESS_BACKGROUND_32" file="default_100_percent/download_progress_background32.png" type="BINDATA" />
-      <include name="IDR_DOWNLOAD_PROGRESS_FOREGROUND_16" file="default_100_percent/download_progress_foreground16.png" type="BINDATA" />
-      <include name="IDR_DOWNLOAD_PROGRESS_FOREGROUND_32" file="default_100_percent/download_progress_foreground32.png" type="BINDATA" />
-      <include name="IDR_EXTENSION_COMMAND_CLOSE" file="default_100_percent/extension_command_close.png" type="BINDATA" />
-      <include name="IDR_EXTENSION_DEFAULT_ICON" file="default_100_percent/extension_default_icon.png" type="BINDATA" />
-      <include name="IDR_EXTENSIONS_FAVICON" file="default_100_percent/plugin.png" type="BINDATA" />
-      <include name="IDR_EXTENSIONS_RATING_STAR_HALF_LEFT" file="default_100_percent/extensions_rating_star_half_left.png" type="BINDATA" />
-      <include name="IDR_EXTENSIONS_RATING_STAR_HALF_RIGHT" file="default_100_percent/extensions_rating_star_half_right.png" type="BINDATA" />
-      <include name="IDR_EXTENSIONS_RATING_STAR_OFF" file="default_100_percent/extensions_rating_star_off.png" type="BINDATA" />
-      <include name="IDR_EXTENSIONS_RATING_STAR_ON" file="default_100_percent/extensions_rating_star_on.png" type="BINDATA" />
-      <include name="IDR_EXTENSIONS_SECTION" file="default_100_percent/extensions_section.png" type="BINDATA" />
       <include name="IDR_EXTENSIONS_SECTION_SMALL" file="default_100_percent/extensions_section_small.png" type="BINDATA" />
       <include name="IDR_FINDINPAGE_NEXT" file="default_100_percent/find_next.png" type="BINDATA" />
       <include name="IDR_FINDINPAGE_NEXT_H" file="default_100_percent/find_next_hover.png" type="BINDATA" />
@@ -124,33 +97,17 @@
       <include name="IDR_FIND_DLG_LEFT_BACKGROUND" file="default_100_percent/find_dlg_left_bg.png" type="BINDATA" />
       <include name="IDR_FIND_DLG_MIDDLE_BACKGROUND" file="default_100_percent/find_dlg_middle_bg.png" type="BINDATA" />
       <include name="IDR_FIND_DLG_RIGHT_BACKGROUND" file="default_100_percent/find_dlg_right_bg.png" type="BINDATA" />
-      <include name="IDR_FROZEN_TAB_ICON" file="default_100_percent/frozen_tab.png" type="BINDATA" />
-      <include name="IDR_FULLSCREEN_MENU_BUTTON" file="default_100_percent/fullscreen_menu_button.png" type="BINDATA" />
-      <include name="IDR_GEOLOCATION_ALLOWED_LOCATIONBAR_ICON" file="default_100_percent/geolocation_allowed_locationbar_icon.png" type="BINDATA" />
-      <include name="IDR_GEOLOCATION_DENIED_LOCATIONBAR_ICON" file="default_100_percent/geolocation_denied_locationbar_icon.png" type="BINDATA" />
       <include name="IDR_REGISTER_PROTOCOL_HANDLER_LOCATIONBAR_ICON" file="default_100_percent/register_protocol_handler_locationbar_icon.png" type="BINDATA" />
-      <include name="IDR_HOMEPAGE_CHANGE_ALERT" file="default_100_percent/protector_home_alert.png" type="BINDATA" />
-      <include name="IDR_HOMEPAGE_CHANGE_BADGE" file="default_100_percent/protector_home_badge.png" type="BINDATA" />
-      <include name="IDR_HOMEPAGE_CHANGE_MENU" file="default_100_percent/protector_home_menu.png" type="BINDATA" />
       <if expr="is_win">
         <include name="IDR_INCOGNITO_SWITCH_ON" file="default_100_percent/incognito_switch_on.png" type="BINDATA" />
         <include name="IDR_INCOGNITO_SWITCH_OFF" file="default_100_percent/incognito_switch_off.png" type="BINDATA" />
         <include name="IDR_INCOMPATIBILITY_DOT_ACTIVE" file="default_100_percent/incompatibility_dot_active.png" type="BINDATA" />
         <include name="IDR_INCOMPATIBILITY_DOT_INACTIVE" file="default_100_percent/incompatibility_dot_inactive.png" type="BINDATA" />
       </if>
-      <include name="IDR_INFO" file="default_100_percent/info_small.png" type="BINDATA" />
       <include name="IDR_INFO_BUBBLE_CLOSE" file="default_100_percent/bubble_close.png" type="BINDATA" />
-      <include name="IDR_INPUT_ALERT" file="default_100_percent/input_alert.png" type="BINDATA" />
-      <include name="IDR_INPUT_GOOD" file="default_100_percent/input_good.png" type="BINDATA" />
       <include name="IDR_KILLED_TAB" file="default_100_percent/killtab.png" type="BINDATA" />
       <include name="IDR_LOCATIONBG_POPUPMODE_CENTER" file="default_100_percent/omnibox_popup_c.png" type="BINDATA" />
       <include name="IDR_LOCATIONBG_POPUPMODE_EDGE" file="default_100_percent/omnibox_popup_edge.png" type="BINDATA" />
-      <if expr="not is_macosx">
-        <include name="IDR_LOCATION_BAR_KEYWORD_HINT_TAB" file="default_100_percent/keyword_hint_tab.png" type="BINDATA" />
-      </if>
-      <if expr="is_macosx">
-        <include name="IDR_LOCATION_BAR_KEYWORD_HINT_TAB" file="default_100_percent/keyword_hint_tab_mac.png" type="BINDATA" />
-      </if>
       <include name="IDR_MAXIMIZE_BUTTON_MASK" file="default_100_percent/maximize_button_mask.png" type="BINDATA" />
       <include name="IDR_MEDIA_STREAM_CAPTURE_LED" file="default_100_percent/media_stream_capture_led.png" type="BINDATA" />
       <include name="IDR_MINIMIZE_BUTTON_MASK" file="default_100_percent/minimize_button_mask.png" type="BINDATA" />
@@ -178,20 +135,6 @@
       <include name="IDR_OMNIBOX_TTS" file="default_100_percent/omnibox_tts.png" type="BINDATA" />
       <include name="IDR_OMNIBOX_TTS_DARK" file="default_100_percent/omnibox_tts_dark.png" type="BINDATA" />
       <include name="IDR_OMNIBOX_TTS_SELECTED" file="default_100_percent/omnibox_tts_selected.png" type="BINDATA" />
-      <include name="IDR_PAGEINFO_BAD" file="default_100_percent/pageinfo_bad.png" type="BINDATA" />
-      <include name="IDR_PAGEINFO_GOOD" file="default_100_percent/pageinfo_good.png" type="BINDATA" />
-      <include name="IDR_PAGEINFO_INFO" file="default_100_percent/pageinfo_info.png" type="BINDATA" />
-      <include name="IDR_PAGEINFO_WARNING_MAJOR" file="default_100_percent/pageinfo_warning_major.png" type="BINDATA" />
-      <include name="IDR_PAGEINFO_WARNING_MINOR" file="default_100_percent/pageinfo_warning_minor.png" type="BINDATA" />
-      <include name="IDR_PANEL_CLOSE" file="default_100_percent/panel_close.png" type="BINDATA" />
-      <include name="IDR_PANEL_CLOSE_H" file="default_100_percent/panel_close_hover.png" type="BINDATA" />
-      <include name="IDR_PANEL_CLOSE_C" file="default_100_percent/panel_close_click.png" type="BINDATA" />
-      <include name="IDR_PANEL_MINIMIZE" file="default_100_percent/panel_minimize.png" type="BINDATA" />
-      <include name="IDR_PANEL_MINIMIZE_H" file="default_100_percent/panel_minimize_hover.png" type="BINDATA" />
-      <include name="IDR_PANEL_MINIMIZE_C" file="default_100_percent/panel_minimize_click.png" type="BINDATA" />
-      <include name="IDR_PANEL_RESTORE" file="default_100_percent/panel_restore.png" type="BINDATA" />
-      <include name="IDR_PANEL_RESTORE_H" file="default_100_percent/panel_restore_hover.png" type="BINDATA" />
-      <include name="IDR_PANEL_RESTORE_C" file="default_100_percent/panel_restore_click.png" type="BINDATA" />
       <include name="IDR_PRERENDER" file="default_100_percent/prerender_succeed_icon.png" type="BINDATA" />
       <include name="IDR_PRERENDER_FAIL_ICON" file="default_100_percent/prerender_fail_icon.png" type="BINDATA"/>
       <include name="IDR_PRERENDER_SUCCEED_ICON" file="default_100_percent/prerender_succeed_icon.png" type="BINDATA"/>
@@ -221,30 +164,7 @@
       <include name="IDR_PROFILE_EDIT_PRESSED" file="default_100_percent/profile_edit_pressed.png" type="BINDATA" />
       <include name="IDR_PROFILE_SELECTED" file="default_100_percent/profile_selected.png" type="BINDATA" />
       <include name="IDR_RESTORE_BUTTON_MASK" file="default_100_percent/restore_button_mask.png" type="BINDATA" />
-      <include name="IDR_SAD_TAB" file="default_100_percent/sadtab.png" type="BINDATA" />
-      <include name="IDR_SAFEBROWSING_WARNING" file="default_100_percent/safebrowsing_warning.png" type="BINDATA" />
-      <include name="IDR_SEARCH_ENGINE_CHANGE_ALERT" file="default_100_percent/protector_search_alert.png" type="BINDATA" />
-      <include name="IDR_SEARCH_ENGINE_CHANGE_BADGE" file="default_100_percent/protector_search_badge.png" type="BINDATA" />
-      <include name="IDR_SEARCH_ENGINE_CHANGE_MENU" file="default_100_percent/protector_search_menu.png" type="BINDATA" />
       <include name="IDR_SIDETABS_NEW_TAB" file="default_100_percent/sidetabs_new_tab.png" type="BINDATA" />
-      <include name="IDR_SPEECH_INPUT_MIC_EMPTY" file="default_100_percent/speech_input_mic_empty.png" type="BINDATA" />
-      <include name="IDR_SPEECH_INPUT_MIC_NOISE" file="default_100_percent/speech_input_mic_noise.png" type="BINDATA" />
-      <include name="IDR_SPEECH_INPUT_MIC_FULL" file="default_100_percent/speech_input_mic_full.png" type="BINDATA" />
-      <include name="IDR_SPEECH_INPUT_MIC_MASK" file="default_100_percent/speech_input_mic_mask.png" type="BINDATA" />
-      <include name="IDR_SPEECH_INPUT_SPINNER" file="default_100_percent/speech_input_spinner.png" type="BINDATA" />
-      <include name="IDR_SPEECH_INPUT_TRAY_BALLOON_ICON" file="default_100_percent/speech_input_tray_balloon_icon.png" type="BINDATA" />
-      <if expr="is_win">
-        <include name="IDR_SPEECH_INPUT_TRAY_MIC_EMPTY" file="default_100_percent/speech_input_tray_windows_mic_empty.png" type="BINDATA" />
-        <include name="IDR_SPEECH_INPUT_TRAY_MIC_FULL" file="default_100_percent/speech_input_tray_windows_mic_full.png" type="BINDATA" />
-      </if>
-      <if expr="is_linux or pp_ifdef('chromeos')">
-        <include name="IDR_SPEECH_INPUT_TRAY_MIC_EMPTY" file="default_100_percent/speech_input_tray_linux_mic_empty.png" type="BINDATA" />
-        <include name="IDR_SPEECH_INPUT_TRAY_MIC_FULL" file="default_100_percent/speech_input_tray_linux_mic_full.png" type="BINDATA" />
-      </if>
-      <if expr="is_macosx">
-        <include name="IDR_SPEECH_INPUT_TRAY_MIC_EMPTY" file="default_100_percent/speech_input_tray_macosx_mic_empty.png" type="BINDATA" />
-        <include name="IDR_SPEECH_INPUT_TRAY_MIC_FULL" file="default_100_percent/speech_input_tray_macosx_mic_full.png" type="BINDATA" />
-      </if>
       <if expr="pp_ifdef('_google_chrome') and is_macosx">
         <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" />
@@ -262,8 +182,6 @@
         <include name="IDR_STATUS_TRAY_ICON_PRESSED" file="chromium/product_logo_22.png" type="BINDATA" />
       </if>
       <if expr="is_macosx">
-        <include name="IDR_SWIPE_BACK" file="default_100_percent/back_large.png" type="BINDATA" />
-        <include name="IDR_SWIPE_FORWARD" file="default_100_percent/forward_large.png" type="BINDATA" />
         <include name="IDR_TABPOSE_CLOSE" file="default_100_percent/tabpose_close.png" type="BINDATA" />
       </if>
       <include name="IDR_THEME_BUTTON_BACKGROUND" file="default_100_percent/notused.png" type="BINDATA" />
@@ -282,28 +200,8 @@
       <include name="IDR_THEME_WINDOW_CONTROL_BACKGROUND" file="default_100_percent/notused.png" type="BINDATA" />
       <include name="IDR_THROBBER_LIGHT" file="default_100_percent/throbber_light.png" type="BINDATA" />
       <include name="IDR_THROBBER_WAITING_LIGHT" file="default_100_percent/throbber_waiting_light.png" type="BINDATA" />
-      <include name="IDR_UPDATE_AVAILABLE" file="default_100_percent/update_available.png" type="BINDATA" />
-      <include name="IDR_UPDATE_BADGE" file="default_100_percent/update_badge.png" type="BINDATA" />
-      <include name="IDR_UPDATE_BADGE2" file="default_100_percent/update_badge2.png" type="BINDATA" />
-      <include name="IDR_UPDATE_BADGE3" file="default_100_percent/update_badge3.png" type="BINDATA" />
-      <include name="IDR_UPDATE_BADGE4" file="default_100_percent/update_badge4.png" type="BINDATA" />
-      <include name="IDR_UPDATE_FAIL" file="default_100_percent/update_fail.png" type="BINDATA" />
-      <include name="IDR_UPDATE_MENU" file="default_100_percent/update_menu.png" type="BINDATA" />
-      <include name="IDR_UPDATE_MENU2" file="default_100_percent/update_menu2.png" type="BINDATA" />
-      <include name="IDR_UPDATE_MENU3" file="default_100_percent/update_menu3.png" type="BINDATA" />
-      <include name="IDR_UPDATE_MENU4" file="default_100_percent/update_menu4.png" type="BINDATA" />
       <include name="IDR_UPDATE_UPTODATE" file="default_100_percent/update_uptodate.png" type="BINDATA" />
-      <include name="IDR_WARNING" file="default_100_percent/alert_small.png" type="BINDATA" />
       <include name="IDR_MANAGED" file="default_100_percent/managed_small.png" type="BINDATA" />
-      <include name="IDR_CONTROLLED_SETTING_MANDATORY_GRAY" file="default_100_percent/controlled_setting_mandatory_gray.png" type="BINDATA" />
-      <include name="IDR_CONTROLLED_SETTING_MANDATORY" file="default_100_percent/controlled_setting_mandatory.png" type="BINDATA" />
-      <include name="IDR_CONTROLLED_SETTING_MANDATORY_LARGE" file="default_100_percent/controlled_setting_mandatory_large.png" type="BINDATA" />
-      <include name="IDR_CONTROLLED_SETTING_EXTENSION_GRAY" file="default_100_percent/controlled_setting_extension_gray.png" type="BINDATA" />
-      <include name="IDR_CONTROLLED_SETTING_EXTENSION" file="default_100_percent/controlled_setting_extension.png" type="BINDATA" />
-      <include name="IDR_CONTROLLED_SETTING_EXTENSION_LARGE" file="default_100_percent/controlled_setting_extension_large.png" type="BINDATA" />
-      <include name="IDR_CONTROLLED_SETTING_RECOMMENDED_GRAY" file="default_100_percent/controlled_setting_recommended_gray.png" type="BINDATA" />
-      <include name="IDR_CONTROLLED_SETTING_RECOMMENDED" file="default_100_percent/controlled_setting_recommended.png" type="BINDATA" />
-      <include name="IDR_CONTROLLED_SETTING_RECOMMENDED_LARGE" file="default_100_percent/controlled_setting_recommended_large.png" type="BINDATA" />
       <if expr="not is_macosx">
         <include name="IDR_MANAGED_MODE_AVATAR" file="default_100_percent/managed_mode_avatar.png" type="BINDATA" />
       </if>
diff --git a/chrome/app/theme/theme_resources_standard.grd b/chrome/app/theme/theme_resources_standard.grd
index fa78b50..65def03 100644
--- a/chrome/app/theme/theme_resources_standard.grd
+++ b/chrome/app/theme/theme_resources_standard.grd
@@ -15,6 +15,9 @@
   <release seq="1">
     <structures fallback_to_low_resolution="true">
       <!-- KEEP THESE IN ALPHABETICAL ORDER! -->
+      <structure type="chrome_scaled_image" name="IDR_ACCESSED_COOKIES" file="accessed_cookies.png" />
+      <structure type="chrome_scaled_image" name="IDR_APP_DEFAULT_ICON" file="app_default_icon.png" />
+      <structure type="chrome_scaled_image" name="IDR_APP_DROPARROW" file="app_droparrow.png" />
       <structure type="chrome_scaled_image" name="IDR_APP_NOTIFICATION_NUB" file="nub.png" />
       <structure type="chrome_scaled_image" name="IDR_APP_NOTIFICATION_NUB_MASK" file="nub_mask.png" />
       <structure type="chrome_scaled_image" name="IDR_APP_NOTIFICATION_SMALL_BUBBLE" file="small_bubble.png" />
@@ -42,6 +45,12 @@
       <structure type="chrome_scaled_image" name="IDR_BLOCKED_PLUGINS" file="blocked_plugins.png" />
       <structure type="chrome_scaled_image" name="IDR_BLOCKED_POPUPS" file="blocked_popups.png" />
       <structure type="chrome_scaled_image" name="IDR_BOOKMARKS_FAVICON" file="bookmarks_favicon.png" />
+      <if expr="not is_macosx">
+        <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER" file="bookmark_bar_folder.png" />
+      </if>
+      <if expr="is_macosx">
+        <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER" file="bookmark_bar_folder_mac.png" />
+      </if>
       <if expr="pp_ifdef('toolkit_views')">
         <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION" file="ash/browser_action_normal.png" />
         <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_H" file="ash/browser_action_hover.png" />
@@ -87,7 +96,34 @@
       <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_LEFT_CORNER_MASK" file="content_top_left_corner_mask.png" />
       <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_RIGHT_CORNER" file="content_top_right_corner.png" />
       <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_RIGHT_CORNER_MASK" file="content_top_right_corner_mask.png" />
+      <structure type="chrome_scaled_image" name="IDR_CONTROLLED_SETTING_EXTENSION" file="controlled_setting_extension.png" />
+      <structure type="chrome_scaled_image" name="IDR_CONTROLLED_SETTING_EXTENSION_GRAY" file="controlled_setting_extension_gray.png" />
+      <structure type="chrome_scaled_image" name="IDR_CONTROLLED_SETTING_EXTENSION_LARGE" file="controlled_setting_extension_large.png" />
+      <structure type="chrome_scaled_image" name="IDR_CONTROLLED_SETTING_MANDATORY" file="controlled_setting_mandatory.png" />
+      <structure type="chrome_scaled_image" name="IDR_CONTROLLED_SETTING_MANDATORY_GRAY" file="controlled_setting_mandatory_gray.png" />
+      <structure type="chrome_scaled_image" name="IDR_CONTROLLED_SETTING_MANDATORY_LARGE" file="controlled_setting_mandatory_large.png" />
+      <structure type="chrome_scaled_image" name="IDR_CONTROLLED_SETTING_RECOMMENDED" file="controlled_setting_recommended.png" />
+      <structure type="chrome_scaled_image" name="IDR_CONTROLLED_SETTING_RECOMMENDED_GRAY" file="controlled_setting_recommended_gray.png" />
+      <structure type="chrome_scaled_image" name="IDR_CONTROLLED_SETTING_RECOMMENDED_LARGE" file="controlled_setting_recommended_large.png" />
+      <structure type="chrome_scaled_image" name="IDR_COOKIE_ICON" file="cookie.png" />
+      <structure type="chrome_scaled_image" name="IDR_COOKIE_STORAGE_ICON" file="cookie_storage.png" />
+      <structure type="chrome_scaled_image" name="IDR_CWS_STAR_EMPTY" file="cws_star_empty.png" />
+      <structure type="chrome_scaled_image" name="IDR_CWS_STAR_FULL" file="cws_star_full.png" />
+      <structure type="chrome_scaled_image" name="IDR_CWS_STAR_HALF" file="cws_star_half.png" />
       <structure type="chrome_scaled_image" name="IDR_DOWNLOADS_FAVICON" file="downloads_favicon.png" />
+      <structure type="chrome_scaled_image" name="IDR_DOWNLOAD_ANIMATION_BEGIN" file="download_animation_begin.png" />
+      <structure type="chrome_scaled_image" name="IDR_DOWNLOAD_PROGRESS_BACKGROUND_16" file="download_progress_background16.png" />
+      <structure type="chrome_scaled_image" name="IDR_DOWNLOAD_PROGRESS_BACKGROUND_32" file="download_progress_background32.png" />
+      <structure type="chrome_scaled_image" name="IDR_DOWNLOAD_PROGRESS_FOREGROUND_16" file="download_progress_foreground16.png" />
+      <structure type="chrome_scaled_image" name="IDR_DOWNLOAD_PROGRESS_FOREGROUND_32" file="download_progress_foreground32.png" />
+      <structure type="chrome_scaled_image" name="IDR_EXTENSIONS_FAVICON" file="plugin.png" />
+      <structure type="chrome_scaled_image" name="IDR_EXTENSIONS_RATING_STAR_HALF_LEFT" file="extensions_rating_star_half_left.png" />
+      <structure type="chrome_scaled_image" name="IDR_EXTENSIONS_RATING_STAR_HALF_RIGHT" file="extensions_rating_star_half_right.png" />
+      <structure type="chrome_scaled_image" name="IDR_EXTENSIONS_RATING_STAR_OFF" file="extensions_rating_star_off.png" />
+      <structure type="chrome_scaled_image" name="IDR_EXTENSIONS_RATING_STAR_ON" file="extensions_rating_star_on.png" />
+      <structure type="chrome_scaled_image" name="IDR_EXTENSIONS_SECTION" file="extensions_section.png" />
+      <structure type="chrome_scaled_image" name="IDR_EXTENSION_COMMAND_CLOSE" file="extension_command_close.png" />
+      <structure type="chrome_scaled_image" name="IDR_EXTENSION_DEFAULT_ICON" file="extension_default_icon.png" />
       <structure type="chrome_scaled_image" name="IDR_FEEDBACK" file="feedback.png" />
       <structure type="chrome_scaled_image" name="IDR_FEEDBACK_H" file="feedback_hover.png" />
       <structure type="chrome_scaled_image" name="IDR_FEEDBACK_P" file="feedback_pressed.png" />
@@ -104,8 +140,15 @@
         <structure type="chrome_scaled_image" name="IDR_FORWARD_H" file="forward_hover.png" />
         <structure type="chrome_scaled_image" name="IDR_FORWARD_P" file="forward_pressed.png" />
       </if>
+      <structure type="chrome_scaled_image" name="IDR_FROZEN_TAB_ICON" file="frozen_tab.png" />
+      <structure type="chrome_scaled_image" name="IDR_FULLSCREEN_MENU_BUTTON" file="fullscreen_menu_button.png" />
+      <structure type="chrome_scaled_image" name="IDR_GEOLOCATION_ALLOWED_LOCATIONBAR_ICON" file="geolocation_allowed_locationbar_icon.png" />
+      <structure type="chrome_scaled_image" name="IDR_GEOLOCATION_DENIED_LOCATIONBAR_ICON" file="geolocation_denied_locationbar_icon.png" />
       <structure type="chrome_scaled_image" name="IDR_GEOLOCATION_INFOBAR_ICON" file="infobar_geolocation.png" />
       <structure type="chrome_scaled_image" name="IDR_HISTORY_FAVICON" file="history_favicon.png" />
+      <structure type="chrome_scaled_image" name="IDR_HOMEPAGE_CHANGE_ALERT" file="protector_home_alert.png" />
+      <structure type="chrome_scaled_image" name="IDR_HOMEPAGE_CHANGE_BADGE" file="protector_home_badge.png" />
+      <structure type="chrome_scaled_image" name="IDR_HOMEPAGE_CHANGE_MENU" file="protector_home_menu.png" />
       <if expr="pp_ifdef('toolkit_views')">
         <structure type="chrome_scaled_image" name="IDR_HOME" file="ash/browser_home_normal.png" />
         <structure type="chrome_scaled_image" name="IDR_HOME_H" file="ash/browser_home_hover.png" />
@@ -116,6 +159,7 @@
         <structure type="chrome_scaled_image" name="IDR_HOME_H" file="home_hover.png" />
         <structure type="chrome_scaled_image" name="IDR_HOME_P" file="home_pressed.png" />
       </if>
+      <structure type="chrome_scaled_image" name="IDR_INFO" file="info_small.png" />
       <structure type="chrome_scaled_image" name="IDR_INFOBAR_ALT_NAV_URL" file="infobar_didyoumean.png" />
       <structure type="chrome_scaled_image" name="IDR_INFOBAR_AUTOFILL" file="infobar_autofill.png" />
       <structure type="chrome_scaled_image" name="IDR_INFOBAR_AUTOLOGIN" file="infobar_autologin.png" />
@@ -134,6 +178,8 @@
       <structure type="chrome_scaled_image" name="IDR_INFOBAR_SYNC" file="infobar_sync.png" />
       <structure type="chrome_scaled_image" name="IDR_INFOBAR_THEME" file="infobar_theme.png" />
       <structure type="chrome_scaled_image" name="IDR_INFOBAR_TRANSLATE" file="infobar_translate.png" />
+      <structure type="chrome_scaled_image" name="IDR_INPUT_ALERT" file="input_alert.png" />
+      <structure type="chrome_scaled_image" name="IDR_INPUT_GOOD" file="input_good.png" />
       <structure type="chrome_scaled_image" name="IDR_KEYWORD_SEARCH_MAGNIFIER" file="keyword_search_magnifier.png" />
       <if expr="pp_ifdef('toolkit_views')">
         <structure type="chrome_scaled_image" name="IDR_LOCATIONBG_C" file="ash/browser_omnibox_middle.png" />
@@ -147,6 +193,12 @@
         <structure type="chrome_scaled_image" name="IDR_LOCATIONBG_R" file="omnibox_r.png" />
         <structure type="chrome_scaled_image" name="IDR_LOCATION_BAR_BORDER" file="omnibox_border.png" />
       </if>
+      <if expr="not is_macosx">
+        <structure type="chrome_scaled_image" name="IDR_LOCATION_BAR_KEYWORD_HINT_TAB" file="keyword_hint_tab.png" />
+      </if>
+      <if expr="is_macosx">
+        <structure type="chrome_scaled_image" name="IDR_LOCATION_BAR_KEYWORD_HINT_TAB" file="keyword_hint_tab_mac.png" />
+      </if>
       <structure type="chrome_scaled_image" name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_C" file="keyword_search_bubble_c.png" />
       <structure type="chrome_scaled_image" name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_L" file="keyword_search_bubble_l.png" />
       <structure type="chrome_scaled_image" name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_R" file="keyword_search_bubble_r.png" />
@@ -179,6 +231,25 @@
         <structure type="chrome_scaled_image" name="IDR_NEWTAB_BUTTON_P" file="newtab_pressed.png" />
         <structure type="chrome_scaled_image" name="IDR_NEWTAB_BUTTON_MASK" file="newtab_button_mask.png" />
       </if>
+      <structure type="chrome_scaled_image" name="IDR_PAGEINFO_BAD" file="pageinfo_bad.png" />
+      <structure type="chrome_scaled_image" name="IDR_PAGEINFO_GOOD" file="pageinfo_good.png" />
+      <structure type="chrome_scaled_image" name="IDR_PAGEINFO_INFO" file="pageinfo_info.png" />
+      <structure type="chrome_scaled_image" name="IDR_PAGEINFO_WARNING_MAJOR" file="pageinfo_warning_major.png" />
+      <structure type="chrome_scaled_image" name="IDR_PAGEINFO_WARNING_MINOR" file="pageinfo_warning_minor.png" />
+      <structure type="chrome_scaled_image" name="IDR_PANEL_CLOSE" file="panel_close.png" />
+      <structure type="chrome_scaled_image" name="IDR_PANEL_CLOSE_C" file="panel_close_click.png" />
+      <structure type="chrome_scaled_image" name="IDR_PANEL_CLOSE_H" file="panel_close_hover.png" />
+      <structure type="chrome_scaled_image" name="IDR_PANEL_MINIMIZE" file="panel_minimize.png" />
+      <structure type="chrome_scaled_image" name="IDR_PANEL_MINIMIZE_C" file="panel_minimize_click.png" />
+      <structure type="chrome_scaled_image" name="IDR_PANEL_MINIMIZE_H" file="panel_minimize_hover.png" />
+      <structure type="chrome_scaled_image" name="IDR_PANEL_RESTORE" file="panel_restore.png" />
+      <structure type="chrome_scaled_image" name="IDR_PANEL_RESTORE_C" file="panel_restore_click.png" />
+      <structure type="chrome_scaled_image" name="IDR_PANEL_RESTORE_H" file="panel_restore_hover.png" />
+      <structure type="chrome_scaled_image" name="IDR_SAD_TAB" file="sadtab.png" />
+      <structure type="chrome_scaled_image" name="IDR_SAFEBROWSING_WARNING" file="safebrowsing_warning.png" />
+      <structure type="chrome_scaled_image" name="IDR_SEARCH_ENGINE_CHANGE_ALERT" file="protector_search_alert.png" />
+      <structure type="chrome_scaled_image" name="IDR_SEARCH_ENGINE_CHANGE_BADGE" file="protector_search_badge.png" />
+      <structure type="chrome_scaled_image" name="IDR_SEARCH_ENGINE_CHANGE_MENU" file="protector_search_menu.png" />
       <structure type="chrome_scaled_image" name="IDR_SETTINGS_FAVICON" file="settings_favicon.png" />
       <structure type="chrome_scaled_image" name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_C" file="ev_bubble_c.png" />
       <structure type="chrome_scaled_image" name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_L" file="ev_bubble_l.png" />
@@ -258,6 +329,24 @@
         <structure type="chrome_scaled_image" name="IDR_RELOAD_P" file="reload_pressed.png" />
       </if>
       <structure type="chrome_scaled_image" name="IDR_SAD_FAVICON" file="sadfavicon.png" />
+      <structure type="chrome_scaled_image" name="IDR_SPEECH_INPUT_MIC_EMPTY" file="speech_input_mic_empty.png" />
+      <structure type="chrome_scaled_image" name="IDR_SPEECH_INPUT_MIC_FULL" file="speech_input_mic_full.png" />
+      <structure type="chrome_scaled_image" name="IDR_SPEECH_INPUT_MIC_MASK" file="speech_input_mic_mask.png" />
+      <structure type="chrome_scaled_image" name="IDR_SPEECH_INPUT_MIC_NOISE" file="speech_input_mic_noise.png" />
+      <structure type="chrome_scaled_image" name="IDR_SPEECH_INPUT_SPINNER" file="speech_input_spinner.png" />
+      <structure type="chrome_scaled_image" name="IDR_SPEECH_INPUT_TRAY_BALLOON_ICON" file="speech_input_tray_balloon_icon.png" />
+      <if expr="is_win">
+        <structure type="chrome_scaled_image" name="IDR_SPEECH_INPUT_TRAY_MIC_EMPTY" file="speech_input_tray_windows_mic_empty.png" />
+      <structure type="chrome_scaled_image" name="IDR_SPEECH_INPUT_TRAY_MIC_FULL" file="speech_input_tray_windows_mic_full.png" />
+      </if>
+      <if expr="is_linux or pp_ifdef('chromeos')">
+        <structure type="chrome_scaled_image" name="IDR_SPEECH_INPUT_TRAY_MIC_EMPTY" file="speech_input_tray_macosx_mic_empty.png" />
+        <structure type="chrome_scaled_image" name="IDR_SPEECH_INPUT_TRAY_MIC_FULL" file="speech_input_tray_macosx_mic_full.png" />
+      </if>
+      <if expr="is_macosx">
+        <structure type="chrome_scaled_image" name="IDR_SPEECH_INPUT_TRAY_MIC_EMPTY" file="speech_input_tray_linux_mic_empty.png" />
+        <structure type="chrome_scaled_image" name="IDR_SPEECH_INPUT_TRAY_MIC_FULL" file="speech_input_tray_linux_mic_full.png" />
+      </if>
       <structure type="chrome_scaled_image" name="IDR_STAR" file="star.png" />
       <structure type="chrome_scaled_image" name="IDR_STAR_LIT" file="star_lit.png" />
       <if expr="pp_ifdef('chromeos')">
@@ -283,6 +372,10 @@
         <structure type="chrome_scaled_image" name="IDR_STOP_H" file="stop_hover.png" />
         <structure type="chrome_scaled_image" name="IDR_STOP_P" file="stop_pressed.png" />
       </if>
+      <if expr="is_macosx">
+        <structure type="chrome_scaled_image" name="IDR_SWIPE_BACK" file="back_large.png" />
+        <structure type="chrome_scaled_image" name="IDR_SWIPE_FORWARD" file="forward_large.png" />
+      </if>
       <if expr="pp_ifdef('toolkit_views')">
         <structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_CENTER" file="ash/tab_active_center.png" />
         <structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_LEFT" file="ash/tab_active_left.png" />
@@ -370,6 +463,17 @@
         <structure type="chrome_scaled_image" name="IDR_TOOLS_H" file="tools_hover.png" />
         <structure type="chrome_scaled_image" name="IDR_TOOLS_P" file="tools_pressed.png" />
       </if>
+      <structure type="chrome_scaled_image" name="IDR_UPDATE_AVAILABLE" file="update_available.png" />
+      <structure type="chrome_scaled_image" name="IDR_UPDATE_BADGE" file="update_badge.png" />
+      <structure type="chrome_scaled_image" name="IDR_UPDATE_BADGE2" file="update_badge2.png" />
+      <structure type="chrome_scaled_image" name="IDR_UPDATE_BADGE3" file="update_badge3.png" />
+      <structure type="chrome_scaled_image" name="IDR_UPDATE_BADGE4" file="update_badge4.png" />
+      <structure type="chrome_scaled_image" name="IDR_UPDATE_FAIL" file="update_fail.png" />
+      <structure type="chrome_scaled_image" name="IDR_UPDATE_MENU" file="update_menu.png" />
+      <structure type="chrome_scaled_image" name="IDR_UPDATE_MENU2" file="update_menu2.png" />
+      <structure type="chrome_scaled_image" name="IDR_UPDATE_MENU3" file="update_menu3.png" />
+      <structure type="chrome_scaled_image" name="IDR_UPDATE_MENU4" file="update_menu4.png" />
+      <structure type="chrome_scaled_image" name="IDR_WARNING" file="alert_small.png" />
       <structure type="chrome_scaled_image" name="IDR_ZOOM_MINUS" file="zoom_minus.png" />
       <structure type="chrome_scaled_image" name="IDR_ZOOM_PLUS" file="zoom_plus.png" />
     </structures>
diff --git a/chrome/browser/chromeos/extensions/file_browser_notifications.cc b/chrome/browser/chromeos/extensions/file_browser_notifications.cc
index b15d892..97800c0 100644
--- a/chrome/browser/chromeos/extensions/file_browser_notifications.cc
+++ b/chrome/browser/chromeos/extensions/file_browser_notifications.cc
@@ -20,6 +20,7 @@
 #include "content/public/browser/browser_thread.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
diff --git a/chrome/browser/chromeos/options/network_config_view.cc b/chrome/browser/chromeos/options/network_config_view.cc
index ae45121..cd95812 100644
--- a/chrome/browser/chromeos/options/network_config_view.cc
+++ b/chrome/browser/chromeos/options/network_config_view.cc
@@ -19,7 +19,7 @@
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
diff --git a/chrome/browser/cookies_tree_model.cc b/chrome/browser/cookies_tree_model.cc
index f662eab..b9be8a5 100644
--- a/chrome/browser/cookies_tree_model.cc
+++ b/chrome/browser/cookies_tree_model.cc
@@ -18,6 +18,7 @@
 #include "chrome/browser/extensions/extension_service.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "grit/ui_resources.h"
 #include "net/base/registry_controlled_domain.h"
 #include "net/cookies/cookie_monster.h"
diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc
index 387a420..57c5ae1 100644
--- a/chrome/browser/download/download_util.cc
+++ b/chrome/browser/download/download_util.cc
@@ -39,7 +39,7 @@
 #include "content/public/common/url_constants.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "net/base/mime_util.h"
 #include "net/base/net_util.h"
 #include "skia/ext/image_operations.h"
diff --git a/chrome/browser/extensions/app_shortcut_manager.cc b/chrome/browser/extensions/app_shortcut_manager.cc
index 9a4e80c..53aba19 100644
--- a/chrome/browser/extensions/app_shortcut_manager.cc
+++ b/chrome/browser/extensions/app_shortcut_manager.cc
@@ -13,7 +13,7 @@
 #include "chrome/common/extensions/extension_resource.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "skia/ext/image_operations.h"
 #include "ui/base/resource/resource_bundle.h"
 
diff --git a/chrome/browser/extensions/extension_disabled_ui.cc b/chrome/browser/extensions/extension_disabled_ui.cc
index 344a233..cc3b50f 100644
--- a/chrome/browser/extensions/extension_disabled_ui.cc
+++ b/chrome/browser/extensions/extension_disabled_ui.cc
@@ -30,7 +30,7 @@
 #include "content/public/browser/notification_source.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using extensions::Extension;
diff --git a/chrome/browser/extensions/extension_icon_manager.cc b/chrome/browser/extensions/extension_icon_manager.cc
index 7f57da2..b539349 100644
--- a/chrome/browser/extensions/extension_icon_manager.cc
+++ b/chrome/browser/extensions/extension_icon_manager.cc
@@ -9,7 +9,7 @@
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_resource.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "skia/ext/image_operations.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
diff --git a/chrome/browser/extensions/extension_install_prompt.cc b/chrome/browser/extensions/extension_install_prompt.cc
index e738073..807b098 100644
--- a/chrome/browser/extensions/extension_install_prompt.cc
+++ b/chrome/browser/extensions/extension_install_prompt.cc
@@ -29,7 +29,7 @@
 #include "chrome/common/extensions/url_pattern.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
diff --git a/chrome/browser/extensions/extension_uninstall_dialog.cc b/chrome/browser/extensions/extension_uninstall_dialog.cc
index 935ff92..53909bc 100644
--- a/chrome/browser/extensions/extension_uninstall_dialog.cc
+++ b/chrome/browser/extensions/extension_uninstall_dialog.cc
@@ -11,7 +11,7 @@
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 
diff --git a/chrome/browser/page_info_model.cc b/chrome/browser/page_info_model.cc
index 1e17636..61d5fff 100644
--- a/chrome/browser/page_info_model.cc
+++ b/chrome/browser/page_info_model.cc
@@ -23,6 +23,7 @@
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "net/base/cert_status_flags.h"
 #include "net/base/ssl_cipher_suite_names.h"
 #include "net/base/ssl_connection_status_flags.h"
diff --git a/chrome/browser/protector/default_search_provider_change.cc b/chrome/browser/protector/default_search_provider_change.cc
index d27e666..6a84642 100644
--- a/chrome/browser/protector/default_search_provider_change.cc
+++ b/chrome/browser/protector/default_search_provider_change.cc
@@ -28,7 +28,7 @@
 #include "googleurl/src/gurl.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace protector {
diff --git a/chrome/browser/protector/homepage_change.cc b/chrome/browser/protector/homepage_change.cc
index 0614d06..e746f83 100644
--- a/chrome/browser/protector/homepage_change.cc
+++ b/chrome/browser/protector/homepage_change.cc
@@ -12,7 +12,7 @@
 #include "chrome/common/pref_names.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace protector {
diff --git a/chrome/browser/protector/prefs_backup_invalid_change.cc b/chrome/browser/protector/prefs_backup_invalid_change.cc
index e29edf7..6259033 100644
--- a/chrome/browser/protector/prefs_backup_invalid_change.cc
+++ b/chrome/browser/protector/prefs_backup_invalid_change.cc
@@ -19,7 +19,7 @@
 #include "googleurl/src/gurl.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace protector {
diff --git a/chrome/browser/protector/session_startup_change.cc b/chrome/browser/protector/session_startup_change.cc
index 46cf3de4..f76b561 100644
--- a/chrome/browser/protector/session_startup_change.cc
+++ b/chrome/browser/protector/session_startup_change.cc
@@ -20,7 +20,7 @@
 #include "chrome/common/pref_names.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace protector {
diff --git a/chrome/browser/speech/speech_recognition_bubble.cc b/chrome/browser/speech/speech_recognition_bubble.cc
index a9aafba..e473722 100644
--- a/chrome/browser/speech/speech_recognition_bubble.cc
+++ b/chrome/browser/speech/speech_recognition_bubble.cc
@@ -8,7 +8,7 @@
 #include "chrome/browser/speech/speech_recognition_bubble.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/rect.h"
diff --git a/chrome/browser/speech/speech_recognition_tray_icon_controller.cc b/chrome/browser/speech/speech_recognition_tray_icon_controller.cc
index 0206fd6..df1b4c6 100644
--- a/chrome/browser/speech/speech_recognition_tray_icon_controller.cc
+++ b/chrome/browser/speech/speech_recognition_tray_icon_controller.cc
@@ -15,7 +15,7 @@
 #include "content/public/browser/browser_thread.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
index 3db4296..80fca29 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
@@ -48,7 +48,7 @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "grit/ui_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "ui/base/l10n/l10n_util_mac.h"
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm
index 502bad4..6fb1a6e 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm
@@ -14,7 +14,7 @@
 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h"
 #include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
diff --git a/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.mm b/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.mm
index 5d2d2a6..0d54904 100644
--- a/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.mm
+++ b/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.mm
@@ -11,7 +11,7 @@
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "grit/ui_resources.h"
 #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #include "ui/base/l10n/l10n_util_mac.h"
diff --git a/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller_unittest.mm b/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller_unittest.mm
index f3dab55..a4e185d 100644
--- a/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller_unittest.mm
@@ -11,7 +11,7 @@
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #include "chrome/test/base/testing_profile.h"
 #include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "grit/ui_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #import "testing/gtest_mac.h"
diff --git a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm
index 0d516b3..8fa1c2e6 100644
--- a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm
+++ b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm
@@ -33,7 +33,7 @@
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"
 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #include "third_party/apple_sample_code/ImageAndTextCell.h"
diff --git a/chrome/browser/ui/cocoa/download/download_item_controller.mm b/chrome/browser/ui/cocoa/download/download_item_controller.mm
index bed91c9..62bf085 100644
--- a/chrome/browser/ui/cocoa/download/download_item_controller.mm
+++ b/chrome/browser/ui/cocoa/download/download_item_controller.mm
@@ -25,7 +25,7 @@
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/page_navigator.h"
 #include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/resource/resource_bundle.h"
diff --git a/chrome/browser/ui/cocoa/download/download_started_animation_mac.mm b/chrome/browser/ui/cocoa/download/download_started_animation_mac.mm
index c4bfaeb..9760607 100644
--- a/chrome/browser/ui/cocoa/download/download_started_animation_mac.mm
+++ b/chrome/browser/ui/cocoa/download/download_started_animation_mac.mm
@@ -19,7 +19,7 @@
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"
 #include "third_party/skia/include/utils/mac/SkCGUtils.h"
 #include "ui/base/resource/resource_bundle.h"
diff --git a/chrome/browser/ui/cocoa/extensions/browser_action_button.mm b/chrome/browser/ui/cocoa/extensions/browser_action_button.mm
index bdd25c7..30ced53 100644
--- a/chrome/browser/ui/cocoa/extensions/browser_action_button.mm
+++ b/chrome/browser/ui/cocoa/extensions/browser_action_button.mm
@@ -19,7 +19,7 @@
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"
 #include "ui/base/resource/resource_bundle.h"
diff --git a/chrome/browser/ui/cocoa/history_overlay_controller.mm b/chrome/browser/ui/cocoa/history_overlay_controller.mm
index 2620aa8..f6cdca1 100644
--- a/chrome/browser/ui/cocoa/history_overlay_controller.mm
+++ b/chrome/browser/ui/cocoa/history_overlay_controller.mm
@@ -5,7 +5,7 @@
 #import "chrome/browser/ui/cocoa/history_overlay_controller.h"
 
 #include "base/logging.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 
diff --git a/chrome/browser/ui/cocoa/hung_renderer_controller.mm b/chrome/browser/ui/cocoa/hung_renderer_controller.mm
index b5c112d..0f2b8eb 100644
--- a/chrome/browser/ui/cocoa/hung_renderer_controller.mm
+++ b/chrome/browser/ui/cocoa/hung_renderer_controller.mm
@@ -24,7 +24,7 @@
 #include "content/public/common/result_codes.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "grit/ui_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
diff --git a/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm b/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm
index 1566ff8..14dc647 100644
--- a/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm
+++ b/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm
@@ -19,7 +19,7 @@
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "content/public/browser/web_contents.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
diff --git a/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.mm b/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.mm
index d9c620a..eb64196 100644
--- a/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.mm
+++ b/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -10,7 +10,7 @@
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #import "chrome/browser/ui/cocoa/image_utils.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "grit/generated_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -57,10 +57,8 @@ KeywordHintDecoration::~KeywordHintDecoration() {
 
 NSImage* KeywordHintDecoration::GetHintImage() {
   if (!hint_image_) {
-    SkBitmap* skiaBitmap = ResourceBundle::GetSharedInstance().
-        GetBitmapNamed(IDR_LOCATION_BAR_KEYWORD_HINT_TAB);
-    if (skiaBitmap)
-      hint_image_.reset([gfx::SkBitmapToNSImage(*skiaBitmap) retain]);
+    hint_image_.reset([ResourceBundle::GetSharedInstance().
+        GetNativeImageNamed(IDR_LOCATION_BAR_KEYWORD_HINT_TAB) retain]);
   }
   return hint_image_;
 }
diff --git a/chrome/browser/ui/cocoa/speech_recognition_window_controller.mm b/chrome/browser/ui/cocoa/speech_recognition_window_controller.mm
index 3eab997..5ef7326 100644
--- a/chrome/browser/ui/cocoa/speech_recognition_window_controller.mm
+++ b/chrome/browser/ui/cocoa/speech_recognition_window_controller.mm
@@ -8,7 +8,7 @@
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/ui/cocoa/info_bubble_view.h"
 #include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #import "skia/ext/skia_utils_mac.h"
 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #include "ui/base/l10n/l10n_util_mac.h"
diff --git a/chrome/browser/ui/cocoa/tab_contents/sad_tab_view.mm b/chrome/browser/ui/cocoa/tab_contents/sad_tab_view.mm
index b79f400..f397782 100644
--- a/chrome/browser/ui/cocoa/tab_contents/sad_tab_view.mm
+++ b/chrome/browser/ui/cocoa/tab_contents/sad_tab_view.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -11,7 +11,7 @@
 #include "chrome/browser/ui/cocoa/tab_contents/sad_tab_controller.h"
 #include "chrome/common/url_constants.h"
 #include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
diff --git a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc
index 64e38d6..85935fb 100644
--- a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc
+++ b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc
@@ -25,7 +25,7 @@
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
diff --git a/chrome/browser/ui/gtk/download/download_item_gtk.cc b/chrome/browser/ui/gtk/download/download_item_gtk.cc
index 35118a2..f4504a3 100644
--- a/chrome/browser/ui/gtk/download/download_item_gtk.cc
+++ b/chrome/browser/ui/gtk/download/download_item_gtk.cc
@@ -27,6 +27,7 @@
 #include "content/public/browser/notification_source.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/ui/gtk/download/download_started_animation_gtk.cc b/chrome/browser/ui/gtk/download/download_started_animation_gtk.cc
index 4a519d5..4398c22 100644
--- a/chrome/browser/ui/gtk/download/download_started_animation_gtk.cc
+++ b/chrome/browser/ui/gtk/download/download_started_animation_gtk.cc
@@ -15,7 +15,7 @@
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "ui/base/animation/linear_animation.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
diff --git a/chrome/browser/ui/gtk/edit_search_engine_dialog.cc b/chrome/browser/ui/gtk/edit_search_engine_dialog.cc
index 0c11cb6..6cf5478 100644
--- a/chrome/browser/ui/gtk/edit_search_engine_dialog.cc
+++ b/chrome/browser/ui/gtk/edit_search_engine_dialog.cc
@@ -18,7 +18,7 @@
 #include "chrome/browser/ui/search_engines/edit_search_engine_controller.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "grit/ui_resources.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc b/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc
index c9a070b..27bce4a 100644
--- a/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc
+++ b/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc
@@ -20,7 +20,7 @@
 #include "content/public/common/result_codes.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/gtk/gtk_signal.h"
diff --git a/chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc b/chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc
index 4e5ff10..9340904 100644
--- a/chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc
+++ b/chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc
@@ -18,7 +18,7 @@
 #include "chrome/common/extensions/extension_resource.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "ui/base/gtk/gtk_signal_registrar.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
diff --git a/chrome/browser/ui/gtk/sad_tab_gtk.cc b/chrome/browser/ui/gtk/sad_tab_gtk.cc
index e5edb3f..f871c51 100644
--- a/chrome/browser/ui/gtk/sad_tab_gtk.cc
+++ b/chrome/browser/ui/gtk/sad_tab_gtk.cc
@@ -11,6 +11,7 @@
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
diff --git a/chrome/browser/ui/gtk/speech_recognition_bubble_gtk.cc b/chrome/browser/ui/gtk/speech_recognition_bubble_gtk.cc
index 8ad3832..3714f34 100644
--- a/chrome/browser/ui/gtk/speech_recognition_bubble_gtk.cc
+++ b/chrome/browser/ui/gtk/speech_recognition_bubble_gtk.cc
@@ -19,7 +19,7 @@
 #include "content/public/browser/speech_recognition_manager.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/gtk/owned_widget_gtk.h"
 #include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/ui/intents/web_intent_picker.cc b/chrome/browser/ui/intents/web_intent_picker.cc
index 7166a6e..32aeb8c 100644
--- a/chrome/browser/ui/intents/web_intent_picker.cc
+++ b/chrome/browser/ui/intents/web_intent_picker.cc
@@ -8,7 +8,7 @@
 
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "ui/gfx/size.h"
 
 namespace {
diff --git a/chrome/browser/ui/intents/web_intent_picker_unittest.cc b/chrome/browser/ui/intents/web_intent_picker_unittest.cc
index 9c3d24f..152ddf2 100644
--- a/chrome/browser/ui/intents/web_intent_picker_unittest.cc
+++ b/chrome/browser/ui/intents/web_intent_picker_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "base/basictypes.h"
 #include "chrome/browser/ui/intents/web_intent_picker.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class WebIntentPickerTest : public testing::Test {
diff --git a/chrome/browser/ui/panels/panel_browser_titlebar_gtk.cc b/chrome/browser/ui/panels/panel_browser_titlebar_gtk.cc
index c3c3fd0..19338fa 100644
--- a/chrome/browser/ui/panels/panel_browser_titlebar_gtk.cc
+++ b/chrome/browser/ui/panels/panel_browser_titlebar_gtk.cc
@@ -17,6 +17,7 @@
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/gtk/gtk_compat.h"
 #include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.cc b/chrome/browser/ui/toolbar/wrench_menu_model.cc
index 39a5358..e10fd97 100644
--- a/chrome/browser/ui/toolbar/wrench_menu_model.cc
+++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc
@@ -46,6 +46,7 @@
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/layout.h"
 #include "ui/base/models/button_menu_item_model.h"
diff --git a/chrome/browser/ui/views/about_chrome_view.cc b/chrome/browser/ui/views/about_chrome_view.cc
index bc7b175..1b97665 100644
--- a/chrome/browser/ui/views/about_chrome_view.cc
+++ b/chrome/browser/ui/views/about_chrome_view.cc
@@ -31,6 +31,7 @@
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
index b17c5d2..ab759e6 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
@@ -49,6 +49,7 @@
 #include "content/public/common/page_transition_types.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "grit/ui_resources.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/animation/slide_animation.h"
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
index 6d7f9a8..485b417 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
@@ -18,7 +18,7 @@
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/user_metrics.h"
 #include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "grit/ui_resources.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/ui/views/collected_cookies_views.cc b/chrome/browser/ui/views/collected_cookies_views.cc
index 91d8c58..5182b04 100644
--- a/chrome/browser/ui/views/collected_cookies_views.cc
+++ b/chrome/browser/ui/views/collected_cookies_views.cc
@@ -30,7 +30,7 @@
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/color_utils.h"
diff --git a/chrome/browser/ui/views/create_application_shortcut_view.cc b/chrome/browser/ui/views/create_application_shortcut_view.cc
index 1e609a8..4c86213 100644
--- a/chrome/browser/ui/views/create_application_shortcut_view.cc
+++ b/chrome/browser/ui/views/create_application_shortcut_view.cc
@@ -25,7 +25,7 @@
 #include "content/public/browser/web_contents_delegate.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_request.h"
 #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/chrome/browser/ui/views/critical_notification_bubble_view.cc b/chrome/browser/ui/views/critical_notification_bubble_view.cc
index ca2d790..56e1f8a 100644
--- a/chrome/browser/ui/views/critical_notification_bubble_view.cc
+++ b/chrome/browser/ui/views/critical_notification_bubble_view.cc
@@ -15,7 +15,7 @@
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/ui/views/download/download_item_view.cc b/chrome/browser/ui/views/download/download_item_view.cc
index b4a88e0..bcb59be 100644
--- a/chrome/browser/ui/views/download/download_item_view.cc
+++ b/chrome/browser/ui/views/download/download_item_view.cc
@@ -26,6 +26,7 @@
 #include "chrome/browser/ui/views/download/download_shelf_view.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/ui/views/download/download_started_animation_views.cc b/chrome/browser/ui/views/download/download_started_animation_views.cc
index 4b42527..4c9957b 100644
--- a/chrome/browser/ui/views/download/download_started_animation_views.cc
+++ b/chrome/browser/ui/views/download/download_started_animation_views.cc
@@ -10,7 +10,7 @@
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "ui/base/animation/linear_animation.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/rect.h"
diff --git a/chrome/browser/ui/views/edit_search_engine_dialog.cc b/chrome/browser/ui/views/edit_search_engine_dialog.cc
index 6aeeeec..e583fc9 100644
--- a/chrome/browser/ui/views/edit_search_engine_dialog.cc
+++ b/chrome/browser/ui/views/edit_search_engine_dialog.cc
@@ -11,7 +11,7 @@
 #include "chrome/browser/ui/search_engines/edit_search_engine_controller.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "grit/ui_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
diff --git a/chrome/browser/ui/views/hung_renderer_view.cc b/chrome/browser/ui/views/hung_renderer_view.cc
index c209718..63951c4 100644
--- a/chrome/browser/ui/views/hung_renderer_view.cc
+++ b/chrome/browser/ui/views/hung_renderer_view.cc
@@ -25,7 +25,7 @@
 #include "content/public/common/result_codes.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
diff --git a/chrome/browser/ui/views/infobars/extension_infobar.cc b/chrome/browser/ui/views/infobars/extension_infobar.cc
index edf4cef..8173623 100644
--- a/chrome/browser/ui/views/infobars/extension_infobar.cc
+++ b/chrome/browser/ui/views/infobars/extension_infobar.cc
@@ -12,7 +12,7 @@
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_resource.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
diff --git a/chrome/browser/ui/views/location_bar/keyword_hint_view.cc b/chrome/browser/ui/views/location_bar/keyword_hint_view.cc
index d844093..d4e0e8c 100644
--- a/chrome/browser/ui/views/location_bar/keyword_hint_view.cc
+++ b/chrome/browser/ui/views/location_bar/keyword_hint_view.cc
@@ -14,7 +14,7 @@
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
diff --git a/chrome/browser/ui/views/sad_tab_view.cc b/chrome/browser/ui/views/sad_tab_view.cc
index 67aa4de..3355647 100644
--- a/chrome/browser/ui/views/sad_tab_view.cc
+++ b/chrome/browser/ui/views/sad_tab_view.cc
@@ -18,6 +18,7 @@
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/font.h"
diff --git a/chrome/browser/ui/views/speech_recognition_bubble_views.cc b/chrome/browser/ui/views/speech_recognition_bubble_views.cc
index 1a6f738..fd7f79c 100644
--- a/chrome/browser/ui/views/speech_recognition_bubble_views.cc
+++ b/chrome/browser/ui/views/speech_recognition_bubble_views.cc
@@ -17,7 +17,7 @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/bubble/bubble_delegate.h"
diff --git a/chrome/browser/ui/views/website_settings_popup_view.cc b/chrome/browser/ui/views/website_settings_popup_view.cc
index a966adb..0f723e4 100644
--- a/chrome/browser/ui/views/website_settings_popup_view.cc
+++ b/chrome/browser/ui/views/website_settings_popup_view.cc
@@ -15,7 +15,7 @@
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "grit/ui_resources_standard.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/base/resource/resource_bundle.h"
diff --git a/chrome/browser/ui/views/wrench_menu.cc b/chrome/browser/ui/views/wrench_menu.cc
index f992827..76233c2 100644
--- a/chrome/browser/ui/views/wrench_menu.cc
+++ b/chrome/browser/ui/views/wrench_menu.cc
@@ -26,7 +26,7 @@
 #include "content/public/browser/web_contents.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/layout.h"
diff --git a/chrome/browser/ui/webui/extensions/extension_icon_source.cc b/chrome/browser/ui/webui/extensions/extension_icon_source.cc
index e257097..50c4f69 100644
--- a/chrome/browser/ui/webui/extensions/extension_icon_source.cc
+++ b/chrome/browser/ui/webui/extensions/extension_icon_source.cc
@@ -22,6 +22,7 @@
 #include "googleurl/src/gurl.h"
 #include "grit/component_extension_resources_map.h"
 #include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "skia/ext/image_operations.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
diff --git a/chrome/browser/upgrade_detector.cc b/chrome/browser/upgrade_detector.cc
index 2544d59..c3c498b 100644
--- a/chrome/browser/upgrade_detector.cc
+++ b/chrome/browser/upgrade_detector.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -12,7 +12,7 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 
 // How long to wait between checks for whether the user has been idle.
 static const int kIdleRepeatingTimerWait = 10;  // Minutes (seconds if testing).
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index cf48af4..6882f56 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -44,7 +44,7 @@
 #include "googleurl/src/url_util.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "net/base/registry_controlled_domain.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/keycodes/keyboard_codes.h"