Split out large icons into a separate resource pak

This is a part of r82185 that was reverted. The change was reverted because it caused a performance regression.

I'm checking in just the reorganization code to narrow down exactly which part of the change caused the regression.

The only code change here is some header includes. If this change passes the perf bot then my next change will be to load the new resource pak.

BUG=None
TEST=None

Review URL: http://codereview.chromium.org/6883110

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

3 files changed, 226 insertions, 248 deletions

diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index 93b547d..496c3ce 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -27,40 +27,8 @@
       <include name="IDR_ACCESSED_COOKIES" file="accessed_cookies.png" type="BINDATA" />
       <include name="IDR_APP_DEFAULT_ICON" file="app_default_icon.png" type="BINDATA" />
       <include name="IDR_APP_DROPARROW" file="app_droparrow.png" type="BINDATA" />
-      <if expr="not pp_ifdef('touchui')">
-        <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_P" file="back_p.png" type="BINDATA" />
-      </if>
-      <if expr="pp_ifdef('touchui')">
-        <include name="IDR_BACK" file="large_back.png" type="BINDATA" />
-        <include name="IDR_BACK_D" file="large_back_d.png" type="BINDATA" />
-        <include name="IDR_BACK_H" file="large_back_h.png" type="BINDATA" />
-        <include name="IDR_BACK_P" file="large_back_p.png" type="BINDATA" />
-      </if>
       <include name="IDR_BALLOON_CLOSE" file="balloon_close.png" type="BINDATA" />
       <include name="IDR_BALLOON_CLOSE_HOVER" file="balloon_close_hover.png" type="BINDATA" />
-      <if expr="not pp_ifdef('touchui')">
-        <include name="IDR_BALLOON_WRENCH" file="notification_wrench.png" type="BINDATA" />
-        <include name="IDR_BALLOON_WRENCH_H" file="notification_wrench_h.png" type="BINDATA" />
-        <include name="IDR_BALLOON_WRENCH_P" file="notification_wrench_p.png" type="BINDATA" />
-        <include name="IDR_BLOCKED_COOKIES" file="blocked_cookies.png" type="BINDATA" />
-        <include name="IDR_BLOCKED_IMAGES" file="blocked_images.png" type="BINDATA" />
-        <include name="IDR_BLOCKED_JAVASCRIPT" file="blocked_script.png" type="BINDATA" />
-        <include name="IDR_BLOCKED_PLUGINS" file="blocked_plugins.png" type="BINDATA" />
-        <include name="IDR_BLOCKED_POPUPS" file="blocked_popups.png" type="BINDATA" />
-      </if>
-      <if expr="pp_ifdef('touchui')">
-        <include name="IDR_BALLOON_WRENCH" file="large_notification_wrench.png" type="BINDATA" />
-        <include name="IDR_BALLOON_WRENCH_H" file="large_notification_wrench_h.png" type="BINDATA" />
-        <include name="IDR_BALLOON_WRENCH_P" file="large_notification_wrench_p.png" type="BINDATA" />
-        <include name="IDR_BLOCKED_COOKIES" file="large_blocked_cookies.png" type="BINDATA" />
-        <include name="IDR_BLOCKED_IMAGES" file="large_blocked_images.png" type="BINDATA" />
-        <include name="IDR_BLOCKED_JAVASCRIPT" file="large_blocked_script.png" type="BINDATA" />
-        <include name="IDR_BLOCKED_PLUGINS" file="large_blocked_plugins.png" type="BINDATA" />
-        <include name="IDR_BLOCKED_POPUPS" file="large_blocked_popups.png" type="BINDATA" />
-      </if>
       <include name="IDR_BOOKMARKS_FAVICON" file="bookmarks_favicon.png" type="BINDATA" />
       <include name="IDR_BOOKMARK_BAR_CHEVRONS" file="chevron.png" type="BINDATA" />
       <if expr="os != 'darwin'">
@@ -69,59 +37,6 @@
       <if expr="os == 'darwin'">
         <include name="IDR_BOOKMARK_BAR_FOLDER" file="bookmark_bar_folder_mac.png" type="BINDATA" />
       </if>
-      <if expr="not pp_ifdef('touchui')">
-        <include name="IDR_BROWSER_ACTION" file="browser_action.png" type="BINDATA" />
-        <include name="IDR_BROWSER_ACTION_H" file="browser_action_h.png" type="BINDATA" />
-        <include name="IDR_BROWSER_ACTION_P" file="browser_action_p.png" type="BINDATA" />
-      </if>
-      <if expr="pp_ifdef('touchui')">
-        <include name="IDR_BROWSER_ACTION" file="large_browser_action.png" type="BINDATA" />
-        <include name="IDR_BROWSER_ACTION_H" file="large_browser_action_h.png" type="BINDATA" />
-        <include name="IDR_BROWSER_ACTION_P" file="large_browser_action_p.png" type="BINDATA" />
-      </if>
-      <if expr="os.find('win') == -1 and not pp_ifdef('touchui')">
-        <include name="IDR_BROWSER_ACTIONS_OVERFLOW" file="browser_actions_overflow.png" type="BINDATA" />
-        <include name="IDR_BROWSER_ACTIONS_OVERFLOW_H" file="browser_actions_overflow_h.png" type="BINDATA" />
-        <include name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="browser_actions_overflow_p.png" type="BINDATA" />
-      </if>
-      <if expr="os.find('win') == -1 and pp_ifdef('touchui')">
-        <include name="IDR_BROWSER_ACTIONS_OVERFLOW" file="large_browser_actions_overflow.png" type="BINDATA" />
-        <include name="IDR_BROWSER_ACTIONS_OVERFLOW_H" file="large_browser_actions_overflow_h.png" type="BINDATA" />
-        <include name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="large_browser_actions_overflow_p.png" type="BINDATA" />
-      </if>
-      <if expr="os.find('win') != -1">
-        <include name="IDR_BROWSER_ACTIONS_OVERFLOW" file="browser_actions_overflow_win.png" type="BINDATA" />
-        <include name="IDR_BROWSER_ACTIONS_OVERFLOW_H" file="browser_actions_overflow_win_h.png" type="BINDATA" />
-        <include name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="browser_actions_overflow_win_p.png" type="BINDATA" />
-      </if>
-      <if expr="not pp_ifdef('touchui')">
-        <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" />
-        <include name="IDR_BUBBLE_B_ARROW" file="bubble_pointer_b.png" type="BINDATA" />
-        <include name="IDR_BUBBLE_L" file="bubble_l.png" type="BINDATA" />
-        <include name="IDR_BUBBLE_L_ARROW" file="bubble_pointer_l.png" type="BINDATA" />
-        <include name="IDR_BUBBLE_R" file="bubble_r.png" type="BINDATA" />
-        <include name="IDR_BUBBLE_R_ARROW" file="bubble_pointer_r.png" type="BINDATA" />
-        <include name="IDR_BUBBLE_T" file="bubble_t.png" type="BINDATA" />
-        <include name="IDR_BUBBLE_TL" file="bubble_tl.png" type="BINDATA" />
-        <include name="IDR_BUBBLE_TR" file="bubble_tr.png" type="BINDATA" />
-        <include name="IDR_BUBBLE_T_ARROW" file="bubble_pointer_t.png" type="BINDATA" />
-      </if>
-      <if expr="pp_ifdef('touchui')">
-        <include name="IDR_BUBBLE_B" file="large_bubble_b.png" type="BINDATA" />
-        <include name="IDR_BUBBLE_BL" file="large_bubble_bl.png" type="BINDATA" />
-        <include name="IDR_BUBBLE_BR" file="large_bubble_br.png" type="BINDATA" />
-        <include name="IDR_BUBBLE_B_ARROW" file="large_bubble_pointer_b.png" type="BINDATA" />
-        <include name="IDR_BUBBLE_L" file="large_bubble_l.png" type="BINDATA" />
-        <include name="IDR_BUBBLE_L_ARROW" file="large_bubble_pointer_l.png" type="BINDATA" />
-        <include name="IDR_BUBBLE_R" file="large_bubble_r.png" type="BINDATA" />
-        <include name="IDR_BUBBLE_R_ARROW" file="large_bubble_pointer_r.png" type="BINDATA" />
-        <include name="IDR_BUBBLE_T" file="large_bubble_t.png" type="BINDATA" />
-        <include name="IDR_BUBBLE_TL" file="large_bubble_tl.png" type="BINDATA" />
-        <include name="IDR_BUBBLE_TR" file="large_bubble_tr.png" type="BINDATA" />
-        <include name="IDR_BUBBLE_T_ARROW" file="large_bubble_pointer_t.png" type="BINDATA" />
-      </if>
       <include name="IDR_CLOSE_BAR" file="close_bar.png" type="BINDATA" />
       <include name="IDR_CLOSE_BAR_H" file="close_bar_h.png" type="BINDATA" />
       <include name="IDR_CLOSE_BAR_MASK" file="close_bar_mask.png" type="BINDATA" />
@@ -140,20 +55,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" />
-      <if expr="not pp_ifdef('touchui')">
-        <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" />
-        <include name="IDR_CONTENT_TOP_RIGHT_CORNER" file="content_top_right_corner.png" type="BINDATA" />
-        <include name="IDR_CONTENT_TOP_RIGHT_CORNER_MASK" file="content_top_right_corner_mask.png" type="BINDATA" />
-      </if>
-      <if expr="pp_ifdef('touchui')">
-        <include name="IDR_CONTENT_TOP_CENTER" file="large_content_top_center.png" type="BINDATA" />
-        <include name="IDR_CONTENT_TOP_LEFT_CORNER" file="large_content_top_left_corner.png" type="BINDATA" />
-        <include name="IDR_CONTENT_TOP_LEFT_CORNER_MASK" file="large_content_top_left_corner_mask.png" type="BINDATA" />
-        <include name="IDR_CONTENT_TOP_RIGHT_CORNER" file="large_content_top_right_corner.png" type="BINDATA" />
-        <include name="IDR_CONTENT_TOP_RIGHT_CORNER_MASK" file="large_content_top_right_corner_mask.png" type="BINDATA" />
-      </if>
       <include name="IDR_COOKIE_ICON" file="cookie.png" type="BINDATA" />
       <include name="IDR_COOKIE_STORAGE_ICON" file="cookie_storage.png" type="BINDATA" />
       <if expr="pp_ifdef('_google_chrome')">
@@ -213,16 +114,6 @@
       <include name="IDR_DOWNLOAD_PROGRESS_FOREGROUND_32" file="download_progress_foreground32.png" type="BINDATA" />
       <include name="IDR_EXTENSION_DEFAULT_ICON" file="extension_default_icon.png" type="BINDATA" />
       <include name="IDR_EXTENSIONS_SECTION" file="extensions_section.png" type="BINDATA" />
-      <if expr="not pp_ifdef('touchui')">
-        <include name="IDR_FEEDBACK" file="feedback.png" type="BINDATA" />
-        <include name="IDR_FEEDBACK_H" file="feedback_h.png" type="BINDATA" />
-        <include name="IDR_FEEDBACK_P" file="feedback_p.png" type="BINDATA" />
-      </if>
-      <if expr="pp_ifdef('touchui')">
-        <include name="IDR_FEEDBACK" file="large_feedback.png" type="BINDATA" />
-        <include name="IDR_FEEDBACK_H" file="large_feedback_h.png" type="BINDATA" />
-        <include name="IDR_FEEDBACK_P" file="large_feedback_p.png" type="BINDATA" />
-      </if>
       <include name="IDR_FINDINPAGE_NEXT" file="find_next.png" type="BINDATA" />
       <include name="IDR_FINDINPAGE_NEXT_H" file="find_next_h.png" type="BINDATA" />
       <include name="IDR_FINDINPAGE_NEXT_P" file="find_next_d.png" type="BINDATA" />
@@ -238,34 +129,12 @@
       <include name="IDR_FIND_DLG_MIDDLE_BACKGROUND" file="find_dlg_middle_bg.png" type="BINDATA" />
       <include name="IDR_FIND_DLG_RIGHT_BACKGROUND" file="find_dlg_right_bg.png" type="BINDATA" />
       <include name="IDR_FLAGS" file="flags.png" type="BINDATA" />
-      <if expr="not pp_ifdef('touchui')">
-        <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" />
-        <include name="IDR_FORWARD_P" file="forward_p.png" type="BINDATA" />
-      </if>
-      <if expr="pp_ifdef('touchui')">
-        <include name="IDR_FORWARD" file="large_forward.png" type="BINDATA" />
-        <include name="IDR_FORWARD_D" file="large_forward_d.png" type="BINDATA" />
-        <include name="IDR_FORWARD_H" file="large_forward_h.png" type="BINDATA" />
-        <include name="IDR_FORWARD_P" file="large_forward_p.png" type="BINDATA" />
-      </if>
       <include name="IDR_FROZEN_TAB_ICON" file="frozen_tab.png" type="BINDATA" />
       <include name="IDR_FULLSCREEN_MENU_BUTTON" file="fullscreen_menu_button.png" type="BINDATA" />
       <include name="IDR_GEOLOCATION_ALLOWED_LOCATIONBAR_ICON" file="geolocation_allowed_locationbar_icon.png" type="BINDATA" />
       <include name="IDR_GEOLOCATION_DENIED_LOCATIONBAR_ICON" file="geolocation_denied_locationbar_icon.png" type="BINDATA" />
       <include name="IDR_GEOLOCATION_INFOBAR_ICON" file="geolocation_infobar_icon.png" type="BINDATA" />
       <include name="IDR_HISTORY_FAVICON" file="history_favicon.png" type="BINDATA" />
-      <if expr="not pp_ifdef('touchui')">
-        <include name="IDR_HOME" file="home.png" type="BINDATA" />
-        <include name="IDR_HOME_H" file="home_h.png" type="BINDATA" />
-        <include name="IDR_HOME_P" file="home_p.png" type="BINDATA" />
-      </if>
-      <if expr="pp_ifdef('touchui')">
-        <include name="IDR_HOME" file="large_home.png" type="BINDATA" />
-        <include name="IDR_HOME_H" file="large_home_h.png" type="BINDATA" />
-        <include name="IDR_HOME_P" file="large_home_p.png" type="BINDATA" />
-      </if>
       <if expr="os.find('win') != -1">
         <include name="IDR_INCOMPATIBILITY_DOT_ACTIVE" file="incompatibility_dot_active.png" type="BINDATA" />
         <include name="IDR_INCOMPATIBILITY_DOT_INACTIVE" file="incompatibility_dot_inactive.png" type="BINDATA" />
@@ -290,53 +159,17 @@
       </if>
       <include name="IDR_INFO_BUBBLE_CLOSE" file="bubble_close.png" type="BINDATA" />
       <include name="IDR_INPUT_ALERT" file="input_alert.png" type="BINDATA" />
-      <if expr="not pp_ifdef('touchui')">
-        <include name="IDR_KEYWORD_SEARCH_MAGNIFIER" file="keyword_search_magnifier.png" type="BINDATA" />
-      </if>
-      <if expr="pp_ifdef('touchui')">
-        <include name="IDR_KEYWORD_SEARCH_MAGNIFIER" file="large_keyword_search_magnifier.png" type="BINDATA" />
-      </if>
       <include name="IDR_KILLED_TAB" file="killtab.png" type="BINDATA" />
-      <if expr="not pp_ifdef('touchui')">
-        <include name="IDR_LOCATIONBG_C" file="omnibox_c.png" type="BINDATA" />
-        <include name="IDR_LOCATIONBG_L" file="omnibox_l.png" type="BINDATA" />
-      </if>
-      <if expr="pp_ifdef('touchui')">
-        <include name="IDR_LOCATIONBG_C" file="large_omnibox_c.png" type="BINDATA" />
-        <include name="IDR_LOCATIONBG_L" file="large_omnibox_l.png" type="BINDATA" />
-      </if>
       <include name="IDR_LOCATIONBG_POPUPMODE_CENTER" file="omnibox_popup_c.png" type="BINDATA" />
       <include name="IDR_LOCATIONBG_POPUPMODE_EDGE" file="omnibox_popup_edge.png" type="BINDATA" />
-      <if expr="not pp_ifdef('touchui')">
-        <include name="IDR_LOCATIONBG_R" file="omnibox_r.png" type="BINDATA" />
-      </if>
-      <if expr="pp_ifdef('touchui')">
-        <include name="IDR_LOCATIONBG_R" file="large_omnibox_r.png" type="BINDATA" />
-      </if>
       <if expr="os != 'darwin'">
         <include name="IDR_LOCATION_BAR_KEYWORD_HINT_TAB" file="keyword_hint_tab.png" type="BINDATA" />
       </if>
       <if expr="os == 'darwin'">
         <include name="IDR_LOCATION_BAR_KEYWORD_HINT_TAB" file="keyword_hint_tab_mac.png" type="BINDATA" />
       </if>
-      <if expr="not pp_ifdef('touchui')">
-        <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_C" file="keyword_search_bubble_c.png" type="BINDATA" />
-        <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_L" file="keyword_search_bubble_l.png" type="BINDATA" />
-        <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_R" file="keyword_search_bubble_r.png" type="BINDATA" />
-      </if>
-      <if expr="pp_ifdef('touchui')">
-        <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_C" file="large_keyword_search_bubble_c.png" type="BINDATA" />
-        <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_L" file="large_keyword_search_bubble_l.png" type="BINDATA" />
-        <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_R" file="large_keyword_search_bubble_r.png" type="BINDATA" />
-      </if>
       <include name="IDR_MAXIMIZE_BUTTON_MASK" file="maximize_button_mask.png" type="BINDATA" />
       <include name="IDR_MINIMIZE_BUTTON_MASK" file="minimize_button_mask.png" type="BINDATA" />
-      <if expr="not pp_ifdef('touchui')">
-        <include name="IDR_NEWTAB_BUTTON" file="newtab.png" type="BINDATA" />
-      </if>
-      <if expr="pp_ifdef('touchui')">
-        <include name="IDR_NEWTAB_BUTTON" file="large_newtab.png" type="BINDATA" />
-      </if>
       <include name="IDR_NEWTAB_BUTTON_H" file="newtab_h.png" type="BINDATA" />
       <include name="IDR_NEWTAB_BUTTON_MASK" file="newtab_button_mask.png" type="BINDATA" />
       <include name="IDR_NEWTAB_BUTTON_P" file="newtab_p.png" type="BINDATA" />
@@ -350,16 +183,6 @@
       <include name="IDR_NEWTAB_OPTION_P" file="ntp_option_p.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" />
-      <if expr="not pp_ifdef('touchui')">
-        <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_C" file="ev_bubble_c.png" type="BINDATA" />
-        <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_L" file="ev_bubble_l.png" type="BINDATA" />
-        <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_R" file="ev_bubble_r.png" type="BINDATA" />
-      </if>
-      <if expr="pp_ifdef('touchui')">
-        <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_C" file="large_ev_bubble_c.png" type="BINDATA" />
-        <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_L" file="large_ev_bubble_l.png" type="BINDATA" />
-        <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_R" file="large_ev_bubble_r.png" type="BINDATA" />
-      </if>
       <include name="IDR_OMNIBOX_EXTENSION_APP" file="omnibox_extension_app.png" type="BINDATA" />
       <include name="IDR_OMNIBOX_EXTENSION_APP_DARK" file="omnibox_extension_app_dark.png" type="BINDATA" />
       <include name="IDR_OMNIBOX_EXTENSION_APP_SELECTED" file="omnibox_extension_app_selected.png" type="BINDATA" />
@@ -411,16 +234,6 @@
       <include name="IDR_PROFILE_TAG_INACTIVE_CENTER" file="profile_tag_inactive_center.png" type="BINDATA" />
       <include name="IDR_PROFILE_TAG_INACTIVE_LEFT" file="profile_tag_inactive_left.png" type="BINDATA" />
       <include name="IDR_PROFILE_TAG_INACTIVE_RIGHT" file="profile_tag_inactive_right.png" type="BINDATA" />
-      <if expr="not pp_ifdef('touchui')">
-        <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" />
-      </if>
-      <if expr="pp_ifdef('touchui')">
-        <include name="IDR_RELOAD" file="large_reload.png" type="BINDATA" />
-        <include name="IDR_RELOAD_H" file="large_reload_h.png" type="BINDATA" />
-        <include name="IDR_RELOAD_P" file="large_reload_p.png" type="BINDATA" />
-      </if>
       <include name="IDR_RESTORE_BUTTON_MASK" file="restore_button_mask.png" type="BINDATA" />
       <include name="IDR_SAD_FAVICON" file="sadfavicon.png" type="BINDATA" />
       <include name="IDR_SAD_TAB" file="sadtab.png" type="BINDATA" />
@@ -502,14 +315,6 @@
       <include name="IDR_SPEECH_INPUT_MIC_FULL" file="speech_input_mic_full.png" type="BINDATA" />
       <include name="IDR_SPEECH_INPUT_MIC_MASK" file="speech_input_mic_mask.png" type="BINDATA" />
       <include name="IDR_SPEECH_INPUT_SPINNER" file="speech_input_spinner.png" type="BINDATA" />
-      <if expr="not pp_ifdef('touchui')">
-        <include name="IDR_STAR" file="star.png" type="BINDATA" />
-        <include name="IDR_STAR_LIT" file="star_lit.png" type="BINDATA" />
-      </if>
-      <if expr="pp_ifdef('touchui')">
-        <include name="IDR_STAR" file="large_star.png" type="BINDATA" />
-        <include name="IDR_STAR_LIT" file="large_star_lit.png" type="BINDATA" />
-      </if>
       <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" />
@@ -526,18 +331,6 @@
         <include name="IDR_STATUS_TRAY_ICON" file="chromium/product_logo_22.png" type="BINDATA" />
         <include name="IDR_STATUS_TRAY_ICON_PRESSED" file="chromium/product_logo_22.png" type="BINDATA" />
       </if>
-      <if expr="not pp_ifdef('touchui')">
-        <include name="IDR_STOP" file="stop.png" type="BINDATA" />
-        <include name="IDR_STOP_D" file="stop_d.png" type="BINDATA" />
-        <include name="IDR_STOP_H" file="stop_h.png" type="BINDATA" />
-        <include name="IDR_STOP_P" file="stop_p.png" type="BINDATA" />
-      </if>
-      <if expr="pp_ifdef('touchui')">
-        <include name="IDR_STOP" file="large_stop.png" type="BINDATA" />
-        <include name="IDR_STOP_D" file="large_stop_d.png" type="BINDATA" />
-        <include name="IDR_STOP_H" file="large_stop_h.png" type="BINDATA" />
-        <include name="IDR_STOP_P" file="large_stop_p.png" type="BINDATA" />
-      </if>
       <if expr="os == 'darwin'">
         <include name="IDR_TABPOSE_CLOSE" file="tabpose_close.png" type="BINDATA" />
       </if>
@@ -556,19 +349,12 @@
       <include name="IDR_TAB_INACTIVE_LEFT" file="tab_inactive_left.png" type="BINDATA" />
       <include name="IDR_TAB_INACTIVE_RIGHT" file="tab_inactive_right.png" type="BINDATA" />
       <include name="IDR_THEME_BUTTON_BACKGROUND" file="notused.png" type="BINDATA" />
-      <if expr="pp_ifdef('chromeos') and not pp_ifdef('touchui')">
-        <include name="IDR_THEME_FRAME" file="theme_frame_default2.png" type="BINDATA" />
-      </if>
-      <if expr="pp_ifdef('chromeos') and pp_ifdef('touchui')">
-        <include name="IDR_THEME_FRAME" file="large_theme_frame_default2.png" type="BINDATA" />
-      </if>
       <if expr="pp_ifdef('chromeos')">
         <include name="IDR_THEME_FRAME_INACTIVE" file="theme_frame_default_inactive2.png" type="BINDATA" />
         <include name="IDR_THEME_FRAME_INCOGNITO" file="theme_frame_default_incognito2.png" type="BINDATA" />
         <include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="theme_frame_default_incognito_inactive2.png" type="BINDATA" />
       </if>
       <if expr="not pp_ifdef('chromeos')">
-        <include name="IDR_THEME_FRAME" file="theme_frame_default.png" type="BINDATA" />
         <include name="IDR_THEME_FRAME_INACTIVE" file="theme_frame_default_inactive.png" type="BINDATA" />
         <include name="IDR_THEME_FRAME_INCOGNITO" file="theme_frame_default_incognito.png" type="BINDATA" />
         <include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="theme_frame_default_incognito_inactive.png" type="BINDATA" />
@@ -577,45 +363,11 @@
       <include name="IDR_THEME_FRAME_OVERLAY_INACTIVE" file="notused.png" type="BINDATA" />
       <include name="IDR_THEME_NTP_ATTRIBUTION" file="notused.png" type="BINDATA" />
       <include name="IDR_THEME_NTP_BACKGROUND" file="ntp_background.png" type="BINDATA" />
-      <if expr="pp_ifdef('chromeos') and not pp_ifdef('touchui')">
-        <include name="IDR_THEME_TAB_BACKGROUND" file="theme_tab_background2.png" type="BINDATA" />
-      </if>
-      <if expr="pp_ifdef('chromeos') and pp_ifdef('touchui')">
-        <include name="IDR_THEME_TAB_BACKGROUND" file="large_theme_tab_background2.png" type="BINDATA" />
-      </if>
-      <if expr="not pp_ifdef('chromeos')">
-        <include name="IDR_THEME_TAB_BACKGROUND" file="theme_tab_background.png" type="BINDATA" />
-      </if>
       <include name="IDR_THEME_TAB_BACKGROUND_INCOGNITO" file="theme_tab_background_incognito.png" type="BINDATA" />
       <include name="IDR_THEME_TAB_BACKGROUND_V" file="theme_tab_background_glass.png" type="BINDATA" />
-      <if expr="pp_ifdef('chromeos') and not pp_ifdef('touchui')">
-        <include name="IDR_THEME_TOOLBAR" file="theme_toolbar_default2.png" type="BINDATA" />
-      </if>
-      <if expr="pp_ifdef('chromeos') and pp_ifdef('touchui')">
-        <include name="IDR_THEME_TOOLBAR" file="large_theme_toolbar_default2.png" type="BINDATA" />
-      </if>
-      <if expr="not pp_ifdef('chromeos')">
-        <include name="IDR_THEME_TOOLBAR" file="theme_toolbar_default.png" type="BINDATA" />
-      </if>
       <include name="IDR_THEME_WINDOW_CONTROL_BACKGROUND" file="notused.png" type="BINDATA" />
       <include name="IDR_THROBBER_LIGHT" file="throbber_light.png" type="BINDATA" />
-      <if expr="not pp_ifdef('touchui')">
-          <include name="IDR_THROBBER_WAITING" file="throbber_waiting.png" type="BINDATA" />
-      </if>
-      <if expr="pp_ifdef('touchui')">
-          <include name="IDR_THROBBER_WAITING" file="large_throbber_waiting.png" type="BINDATA" />
-      </if>
       <include name="IDR_THROBBER_WAITING_LIGHT" file="throbber_waiting_light.png" type="BINDATA" />
-      <if expr="not pp_ifdef('touchui')">
-        <include name="IDR_TOOLS" file="tools.png" type="BINDATA" />
-        <include name="IDR_TOOLS_H" file="tools_h.png" type="BINDATA" />
-        <include name="IDR_TOOLS_P" file="tools_p.png" type="BINDATA" />
-      </if>
-      <if expr="pp_ifdef('touchui')">
-        <include name="IDR_TOOLS" file="large_tools.png" type="BINDATA" />
-        <include name="IDR_TOOLS_H" file="large_tools_h.png" type="BINDATA" />
-        <include name="IDR_TOOLS_P" file="large_tools_p.png" type="BINDATA" />
-      </if>
       <include name="IDR_UPDATE_AVAILABLE" file="update_available.png" type="BINDATA" />
       <include name="IDR_UPDATE_BADGE" file="update_badge.png" type="BINDATA" />
       <include name="IDR_UPDATE_BADGE2" file="update_badge2.png" type="BINDATA" />
diff --git a/chrome/app/theme/theme_resources_large.grd b/chrome/app/theme/theme_resources_large.grd
new file mode 100644
index 0000000..0c8e5f8
--- /dev/null
+++ b/chrome/app/theme/theme_resources_large.grd
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grit latest_public_release="0" current_release="1">
+  <outputs>
+    <output filename="grit/theme_resources_large.h" type="rc_header">
+      <emit emit_type='prepend'></emit>
+    </output>
+    <output filename="grit/theme_resources_large_map.cc" type="resource_map_source" />
+    <output filename="grit/theme_resources_large_map.h" type="resource_map_header" />
+    <output filename="theme_resources_large.pak" type="data_package" />
+    <output filename="theme_resources_large.rc" type="rc_all" />
+  </outputs>
+  <release seq="1">
+    <includes>
+      <!-- KEEP THESE IN ALPHABETICAL ORDER AND SYNCHRONIZED WITH
+           theme_resources_standard.grd. THIS MEANS THAT EACH ICON IN THIS FILE
+           MUST HAVE AN EQUIVALENT ICON IN THE OTHER FILE.-->
+      <include name="IDR_BACK" file="large_back.png" type="BINDATA" />
+      <include name="IDR_BACK_D" file="large_back_d.png" type="BINDATA" />
+      <include name="IDR_BACK_H" file="large_back_h.png" type="BINDATA" />
+      <include name="IDR_BACK_P" file="large_back_p.png" type="BINDATA" />
+      <include name="IDR_BALLOON_WRENCH" file="large_notification_wrench.png" type="BINDATA" />
+      <include name="IDR_BALLOON_WRENCH_H" file="large_notification_wrench_h.png" type="BINDATA" />
+      <include name="IDR_BALLOON_WRENCH_P" file="large_notification_wrench_p.png" type="BINDATA" />
+      <include name="IDR_BLOCKED_COOKIES" file="large_blocked_cookies.png" type="BINDATA" />
+      <include name="IDR_BLOCKED_IMAGES" file="large_blocked_images.png" type="BINDATA" />
+      <include name="IDR_BLOCKED_JAVASCRIPT" file="large_blocked_script.png" type="BINDATA" />
+      <include name="IDR_BLOCKED_PLUGINS" file="large_blocked_plugins.png" type="BINDATA" />
+      <include name="IDR_BLOCKED_POPUPS" file="large_blocked_popups.png" type="BINDATA" />
+      <include name="IDR_BROWSER_ACTION" file="large_browser_action.png" type="BINDATA" />
+      <include name="IDR_BROWSER_ACTION_H" file="large_browser_action_h.png" type="BINDATA" />
+      <include name="IDR_BROWSER_ACTION_P" file="large_browser_action_p.png" type="BINDATA" />
+      <if expr="os.find('win') == -1">
+        <include name="IDR_BROWSER_ACTIONS_OVERFLOW" file="large_browser_actions_overflow.png" type="BINDATA" />
+        <include name="IDR_BROWSER_ACTIONS_OVERFLOW_H" file="large_browser_actions_overflow_h.png" type="BINDATA" />
+        <include name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="large_browser_actions_overflow_p.png" type="BINDATA" />
+      </if>
+      <if expr="os.find('win') != -1">
+        <include name="IDR_BROWSER_ACTIONS_OVERFLOW" file="browser_actions_overflow_win.png" type="BINDATA" />
+        <include name="IDR_BROWSER_ACTIONS_OVERFLOW_H" file="browser_actions_overflow_win_h.png" type="BINDATA" />
+        <include name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="browser_actions_overflow_win_p.png" type="BINDATA" />
+      </if>
+      <include name="IDR_BUBBLE_B" file="large_bubble_b.png" type="BINDATA" />
+      <include name="IDR_BUBBLE_BL" file="large_bubble_bl.png" type="BINDATA" />
+      <include name="IDR_BUBBLE_BR" file="large_bubble_br.png" type="BINDATA" />
+      <include name="IDR_BUBBLE_B_ARROW" file="large_bubble_pointer_b.png" type="BINDATA" />
+      <include name="IDR_BUBBLE_L" file="large_bubble_l.png" type="BINDATA" />
+      <include name="IDR_BUBBLE_L_ARROW" file="large_bubble_pointer_l.png" type="BINDATA" />
+      <include name="IDR_BUBBLE_R" file="large_bubble_r.png" type="BINDATA" />
+      <include name="IDR_BUBBLE_R_ARROW" file="large_bubble_pointer_r.png" type="BINDATA" />
+      <include name="IDR_BUBBLE_T" file="large_bubble_t.png" type="BINDATA" />
+      <include name="IDR_BUBBLE_TL" file="large_bubble_tl.png" type="BINDATA" />
+      <include name="IDR_BUBBLE_TR" file="large_bubble_tr.png" type="BINDATA" />
+      <include name="IDR_BUBBLE_T_ARROW" file="large_bubble_pointer_t.png" type="BINDATA" />
+      <include name="IDR_CONTENT_TOP_CENTER" file="large_content_top_center.png" type="BINDATA" />
+      <include name="IDR_CONTENT_TOP_LEFT_CORNER" file="large_content_top_left_corner.png" type="BINDATA" />
+      <include name="IDR_CONTENT_TOP_LEFT_CORNER_MASK" file="large_content_top_left_corner_mask.png" type="BINDATA" />
+      <include name="IDR_CONTENT_TOP_RIGHT_CORNER" file="large_content_top_right_corner.png" type="BINDATA" />
+      <include name="IDR_CONTENT_TOP_RIGHT_CORNER_MASK" file="large_content_top_right_corner_mask.png" type="BINDATA" />
+      <include name="IDR_FEEDBACK" file="large_feedback.png" type="BINDATA" />
+      <include name="IDR_FEEDBACK_H" file="large_feedback_h.png" type="BINDATA" />
+      <include name="IDR_FEEDBACK_P" file="large_feedback_p.png" type="BINDATA" />
+      <include name="IDR_FORWARD" file="large_forward.png" type="BINDATA" />
+      <include name="IDR_FORWARD_D" file="large_forward_d.png" type="BINDATA" />
+      <include name="IDR_FORWARD_H" file="large_forward_h.png" type="BINDATA" />
+      <include name="IDR_FORWARD_P" file="large_forward_p.png" type="BINDATA" />
+      <include name="IDR_HOME" file="large_home.png" type="BINDATA" />
+      <include name="IDR_HOME_H" file="large_home_h.png" type="BINDATA" />
+      <include name="IDR_HOME_P" file="large_home_p.png" type="BINDATA" />
+      <include name="IDR_KEYWORD_SEARCH_MAGNIFIER" file="large_keyword_search_magnifier.png" type="BINDATA" />
+      <include name="IDR_LOCATIONBG_C" file="large_omnibox_c.png" type="BINDATA" />
+      <include name="IDR_LOCATIONBG_L" file="large_omnibox_l.png" type="BINDATA" />
+      <include name="IDR_LOCATIONBG_R" file="large_omnibox_r.png" type="BINDATA" />
+      <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_C" file="large_keyword_search_bubble_c.png" type="BINDATA" />
+      <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_L" file="large_keyword_search_bubble_l.png" type="BINDATA" />
+      <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_R" file="large_keyword_search_bubble_r.png" type="BINDATA" />
+      <include name="IDR_NEWTAB_BUTTON" file="large_newtab.png" type="BINDATA" />
+      <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_C" file="large_ev_bubble_c.png" type="BINDATA" />
+      <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_L" file="large_ev_bubble_l.png" type="BINDATA" />
+      <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_R" file="large_ev_bubble_r.png" type="BINDATA" />
+      <include name="IDR_RELOAD" file="large_reload.png" type="BINDATA" />
+      <include name="IDR_RELOAD_H" file="large_reload_h.png" type="BINDATA" />
+      <include name="IDR_RELOAD_P" file="large_reload_p.png" type="BINDATA" />
+      <include name="IDR_STAR" file="large_star.png" type="BINDATA" />
+      <include name="IDR_STAR_LIT" file="large_star_lit.png" type="BINDATA" />
+      <include name="IDR_STOP" file="large_stop.png" type="BINDATA" />
+      <include name="IDR_STOP_D" file="large_stop_d.png" type="BINDATA" />
+      <include name="IDR_STOP_H" file="large_stop_h.png" type="BINDATA" />
+      <include name="IDR_STOP_P" file="large_stop_p.png" type="BINDATA" />
+      <if expr="pp_ifdef('chromeos')">
+        <include name="IDR_THEME_FRAME" file="large_theme_frame_default2.png" type="BINDATA" />
+      </if>
+      <if expr="not pp_ifdef('chromeos')">
+        <include name="IDR_THEME_FRAME" file="theme_frame_default.png" type="BINDATA" />
+      </if>
+      <if expr="pp_ifdef('chromeos')">
+        <include name="IDR_THEME_TAB_BACKGROUND" file="large_theme_tab_background2.png" type="BINDATA" />
+      </if>
+      <if expr="not pp_ifdef('chromeos')">
+        <include name="IDR_THEME_TAB_BACKGROUND" file="theme_tab_background.png" type="BINDATA" />
+      </if>
+      <if expr="pp_ifdef('chromeos')">
+        <include name="IDR_THEME_TOOLBAR" file="large_theme_toolbar_default2.png" type="BINDATA" />
+      </if>
+      <if expr="not pp_ifdef('chromeos')">
+        <include name="IDR_THEME_TOOLBAR" file="theme_toolbar_default.png" type="BINDATA" />
+      </if>
+      <include name="IDR_THROBBER_WAITING" file="large_throbber_waiting.png" type="BINDATA" />
+      <include name="IDR_TOOLS" file="large_tools.png" type="BINDATA" />
+      <include name="IDR_TOOLS_H" file="large_tools_h.png" type="BINDATA" />
+      <include name="IDR_TOOLS_P" file="large_tools_p.png" type="BINDATA" />
+    </includes>
+  </release>
+</grit>
diff --git a/chrome/app/theme/theme_resources_standard.grd b/chrome/app/theme/theme_resources_standard.grd
new file mode 100644
index 0000000..d0ab636
--- /dev/null
+++ b/chrome/app/theme/theme_resources_standard.grd
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grit latest_public_release="0" current_release="1">
+  <outputs>
+    <output filename="grit/theme_resources_standard.h" type="rc_header">
+      <emit emit_type='prepend'></emit>
+    </output>
+    <output filename="grit/theme_resources_standard_map.cc" type="resource_map_source" />
+    <output filename="grit/theme_resources_standard_map.h" type="resource_map_header" />
+    <output filename="theme_resources_standard.pak" type="data_package" />
+    <output filename="theme_resources_standard.rc" type="rc_all" />
+  </outputs>
+  <release seq="1">
+    <includes>
+      <!-- KEEP THESE IN ALPHABETICAL ORDER AND SYNCHRONIZED WITH
+           theme_resources_large.grd. THIS MEANS THAT EACH ICON IN THIS FILE
+           MUST HAVE AN EQUIVALENT ICON IN THE OTHER FILE.-->
+      <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_P" file="back_p.png" type="BINDATA" />
+      <include name="IDR_BALLOON_WRENCH" file="notification_wrench.png" type="BINDATA" />
+      <include name="IDR_BALLOON_WRENCH_H" file="notification_wrench_h.png" type="BINDATA" />
+      <include name="IDR_BALLOON_WRENCH_P" file="notification_wrench_p.png" type="BINDATA" />
+      <include name="IDR_BLOCKED_COOKIES" file="blocked_cookies.png" type="BINDATA" />
+      <include name="IDR_BLOCKED_IMAGES" file="blocked_images.png" type="BINDATA" />
+      <include name="IDR_BLOCKED_JAVASCRIPT" file="blocked_script.png" type="BINDATA" />
+      <include name="IDR_BLOCKED_PLUGINS" file="blocked_plugins.png" type="BINDATA" />
+      <include name="IDR_BLOCKED_POPUPS" file="blocked_popups.png" type="BINDATA" />
+      <include name="IDR_BROWSER_ACTION" file="browser_action.png" type="BINDATA" />
+      <include name="IDR_BROWSER_ACTION_H" file="browser_action_h.png" type="BINDATA" />
+      <include name="IDR_BROWSER_ACTION_P" file="browser_action_p.png" type="BINDATA" />
+      <if expr="os.find('win') == -1">
+        <include name="IDR_BROWSER_ACTIONS_OVERFLOW" file="browser_actions_overflow.png" type="BINDATA" />
+        <include name="IDR_BROWSER_ACTIONS_OVERFLOW_H" file="browser_actions_overflow_h.png" type="BINDATA" />
+        <include name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="browser_actions_overflow_p.png" type="BINDATA" />
+      </if>
+      <if expr="os.find('win') != -1">
+        <include name="IDR_BROWSER_ACTIONS_OVERFLOW" file="browser_actions_overflow_win.png" type="BINDATA" />
+        <include name="IDR_BROWSER_ACTIONS_OVERFLOW_H" file="browser_actions_overflow_win_h.png" type="BINDATA" />
+        <include name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="browser_actions_overflow_win_p.png" type="BINDATA" />
+      </if>
+      <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" />
+      <include name="IDR_BUBBLE_B_ARROW" file="bubble_pointer_b.png" type="BINDATA" />
+      <include name="IDR_BUBBLE_L" file="bubble_l.png" type="BINDATA" />
+      <include name="IDR_BUBBLE_L_ARROW" file="bubble_pointer_l.png" type="BINDATA" />
+      <include name="IDR_BUBBLE_R" file="bubble_r.png" type="BINDATA" />
+      <include name="IDR_BUBBLE_R_ARROW" file="bubble_pointer_r.png" type="BINDATA" />
+      <include name="IDR_BUBBLE_T" file="bubble_t.png" type="BINDATA" />
+      <include name="IDR_BUBBLE_TL" file="bubble_tl.png" type="BINDATA" />
+      <include name="IDR_BUBBLE_TR" file="bubble_tr.png" type="BINDATA" />
+      <include name="IDR_BUBBLE_T_ARROW" file="bubble_pointer_t.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" />
+      <include name="IDR_CONTENT_TOP_RIGHT_CORNER" file="content_top_right_corner.png" type="BINDATA" />
+      <include name="IDR_CONTENT_TOP_RIGHT_CORNER_MASK" file="content_top_right_corner_mask.png" type="BINDATA" />
+      <include name="IDR_FEEDBACK" file="feedback.png" type="BINDATA" />
+      <include name="IDR_FEEDBACK_H" file="feedback_h.png" type="BINDATA" />
+      <include name="IDR_FEEDBACK_P" file="feedback_p.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" />
+      <include name="IDR_FORWARD_P" file="forward_p.png" type="BINDATA" />
+      <include name="IDR_HOME" file="home.png" type="BINDATA" />
+      <include name="IDR_HOME_H" file="home_h.png" type="BINDATA" />
+      <include name="IDR_HOME_P" file="home_p.png" type="BINDATA" />
+      <include name="IDR_KEYWORD_SEARCH_MAGNIFIER" file="keyword_search_magnifier.png" type="BINDATA" />
+      <include name="IDR_LOCATIONBG_C" file="omnibox_c.png" type="BINDATA" />
+      <include name="IDR_LOCATIONBG_L" file="omnibox_l.png" type="BINDATA" />
+      <include name="IDR_LOCATIONBG_R" file="omnibox_r.png" type="BINDATA" />
+      <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_C" file="keyword_search_bubble_c.png" type="BINDATA" />
+      <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_L" file="keyword_search_bubble_l.png" type="BINDATA" />
+      <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_R" file="keyword_search_bubble_r.png" type="BINDATA" />
+      <include name="IDR_NEWTAB_BUTTON" file="newtab.png" type="BINDATA" />
+      <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_C" file="ev_bubble_c.png" type="BINDATA" />
+      <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_L" file="ev_bubble_l.png" type="BINDATA" />
+      <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_R" file="ev_bubble_r.png" type="BINDATA" />
+      <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" />
+      <include name="IDR_STAR" file="star.png" type="BINDATA" />
+      <include name="IDR_STAR_LIT" file="star_lit.png" type="BINDATA" />
+      <include name="IDR_STOP" file="stop.png" type="BINDATA" />
+      <include name="IDR_STOP_D" file="stop_d.png" type="BINDATA" />
+      <include name="IDR_STOP_H" file="stop_h.png" type="BINDATA" />
+      <include name="IDR_STOP_P" file="stop_p.png" type="BINDATA" />
+      <if expr="pp_ifdef('chromeos')">
+        <include name="IDR_THEME_FRAME" file="theme_frame_default2.png" type="BINDATA" />
+      </if>
+      <if expr="not pp_ifdef('chromeos')">
+        <include name="IDR_THEME_FRAME" file="theme_frame_default.png" type="BINDATA" />
+      </if>
+      <if expr="pp_ifdef('chromeos')">
+        <include name="IDR_THEME_TAB_BACKGROUND" file="theme_tab_background2.png" type="BINDATA" />
+      </if>
+      <if expr="not pp_ifdef('chromeos')">
+        <include name="IDR_THEME_TAB_BACKGROUND" file="theme_tab_background.png" type="BINDATA" />
+      </if>
+      <if expr="pp_ifdef('chromeos')">
+        <include name="IDR_THEME_TOOLBAR" file="theme_toolbar_default2.png" type="BINDATA" />
+      </if>
+      <if expr="not pp_ifdef('chromeos')">
+        <include name="IDR_THEME_TOOLBAR" file="theme_toolbar_default.png" type="BINDATA" />
+      </if>
+      <include name="IDR_THROBBER_WAITING" file="throbber_waiting.png" type="BINDATA" />
+      <include name="IDR_TOOLS" file="tools.png" type="BINDATA" />
+      <include name="IDR_TOOLS_H" file="tools_h.png" type="BINDATA" />
+      <include name="IDR_TOOLS_P" file="tools_p.png" type="BINDATA" />
+    </includes>
+  </release>
+</grit>