diff options
| author | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-21 16:53:04 +0000 |
|---|---|---|
| committer | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-21 16:53:04 +0000 |
| commit | 3ca9a76e1fa625c27c3f23d5071b213a7b5f4102 (patch) | |
| tree | 973e7f6eeed9eb73c0766689e61ba96efaed6fdc | |
| parent | 028c4ec16f1af021ee2b04006b8f8ca4de21d7c3 (diff) | |
| download | chromium_src-3ca9a76e1fa625c27c3f23d5071b213a7b5f4102.zip chromium_src-3ca9a76e1fa625c27c3f23d5071b213a7b5f4102.tar.gz chromium_src-3ca9a76e1fa625c27c3f23d5071b213a7b5f4102.tar.bz2 | |
Revert 82497 - Split out large icons into a separate resource pakThis 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=NoneTEST=NoneReview URL: http://codereview.chromium.org/6883110
TBR=sail@chromium.org
Review URL: http://codereview.chromium.org/6879113
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82502 0039d316-1c4b-4281-b951-d872f2087c98
54 files changed, 251 insertions, 369 deletions
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd index 496c3ce..93b547d 100644 --- a/chrome/app/theme/theme_resources.grd +++ b/chrome/app/theme/theme_resources.grd @@ -27,8 +27,40 @@ <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'"> @@ -37,6 +69,59 @@ <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" /> @@ -55,6 +140,20 @@ <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')"> @@ -114,6 +213,16 @@ <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" /> @@ -129,12 +238,34 @@ <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" /> @@ -159,17 +290,53 @@ </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" /> @@ -183,6 +350,16 @@ <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" /> @@ -234,6 +411,16 @@ <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" /> @@ -315,6 +502,14 @@ <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" /> @@ -331,6 +526,18 @@ <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> @@ -349,12 +556,19 @@ <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" /> @@ -363,11 +577,45 @@ <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 deleted file mode 100644 index 0c8e5f8..0000000 --- a/chrome/app/theme/theme_resources_large.grd +++ /dev/null @@ -1,113 +0,0 @@ -<?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 deleted file mode 100644 index d0ab636..0000000 --- a/chrome/app/theme/theme_resources_standard.grd +++ /dev/null @@ -1,113 +0,0 @@ -<?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> diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm index b2c0b48..fcd92f1 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm +++ b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm @@ -20,7 +20,6 @@ #include "content/browser/tab_contents/tab_contents.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "grit/theme_resources_standard.h" #include "net/base/escape.h" #import "third_party/mozilla/NSPasteboard+Utils.h" #include "ui/base/clipboard/clipboard.h" diff --git a/chrome/browser/content_setting_image_model.cc b/chrome/browser/content_setting_image_model.cc index c092872..f8419d9 100644 --- a/chrome/browser/content_setting_image_model.cc +++ b/chrome/browser/content_setting_image_model.cc @@ -11,7 +11,6 @@ #include "content/browser/tab_contents/tab_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" class ContentSettingBlockedImageModel : public ContentSettingImageModel { diff --git a/chrome/browser/resources_util.cc b/chrome/browser/resources_util.cc index 99a2743..ab2fe9d 100644 --- a/chrome/browser/resources_util.cc +++ b/chrome/browser/resources_util.cc @@ -9,7 +9,6 @@ #include "base/hash_tables.h" #include "base/lazy_instance.h" #include "grit/theme_resources_map.h" -#include "grit/theme_resources_standard_map.h" namespace { @@ -24,10 +23,6 @@ class ThemeMap { for (size_t i = 0; i < kThemeResourcesSize; ++i) { id_map_[kThemeResources[i].name] = kThemeResources[i].value; } - for (size_t i = 0; i < kThemeResourcesStandardSize; ++i) { - id_map_[kThemeResourcesStandard[i].name] = - kThemeResourcesStandard[i].value; - } } int GetId(const std::string& resource_name) { diff --git a/chrome/browser/resources_util_unittest.cc b/chrome/browser/resources_util_unittest.cc index de3d0d8..51651da 100644 --- a/chrome/browser/resources_util_unittest.cc +++ b/chrome/browser/resources_util_unittest.cc @@ -5,7 +5,6 @@ #include "chrome/browser/resources_util.h" #include "grit/theme_resources.h" -#include "grit/theme_resources_standard.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome/browser/themes/browser_theme_pack.cc b/chrome/browser/themes/browser_theme_pack.cc index 4bdee1c..274cae3 100644 --- a/chrome/browser/themes/browser_theme_pack.cc +++ b/chrome/browser/themes/browser_theme_pack.cc @@ -13,7 +13,6 @@ #include "content/browser/browser_thread.h" #include "grit/app_resources.h" #include "grit/theme_resources.h" -#include "grit/theme_resources_standard.h" #include "net/base/file_stream.h" #include "net/base/net_errors.h" #include "third_party/skia/include/core/SkCanvas.h" diff --git a/chrome/browser/themes/browser_theme_pack_unittest.cc b/chrome/browser/themes/browser_theme_pack_unittest.cc index a94ed54..92dc94c 100644 --- a/chrome/browser/themes/browser_theme_pack_unittest.cc +++ b/chrome/browser/themes/browser_theme_pack_unittest.cc @@ -15,7 +15,6 @@ #include "content/browser/browser_thread.h" #include "content/common/json_value_serializer.h" #include "grit/theme_resources.h" -#include "grit/theme_resources_standard.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/color_utils.h" diff --git a/chrome/browser/themes/theme_service.cc b/chrome/browser/themes/theme_service.cc index 132208f..5d1c60e 100644 --- a/chrome/browser/themes/theme_service.cc +++ b/chrome/browser/themes/theme_service.cc @@ -17,7 +17,6 @@ #include "content/common/notification_type.h" #include "grit/app_resources.h" #include "grit/theme_resources.h" -#include "grit/theme_resources_standard.h" #include "ui/base/resource/resource_bundle.h" #if defined(OS_WIN) diff --git a/chrome/browser/ui/cocoa/background_gradient_view.mm b/chrome/browser/ui/cocoa/background_gradient_view.mm index 936e3c0..4f808c8 100644 --- a/chrome/browser/ui/cocoa/background_gradient_view.mm +++ b/chrome/browser/ui/cocoa/background_gradient_view.mm @@ -8,7 +8,6 @@ #import "chrome/browser/ui/cocoa/nsview_additions.h" #import "chrome/browser/ui/cocoa/themed_window.h" #include "grit/theme_resources.h" -#include "grit/theme_resources_standard.h" #define kToolbarTopOffset 12 #define kToolbarMaxHeight 100 diff --git a/chrome/browser/ui/cocoa/browser_frame_view.mm b/chrome/browser/ui/cocoa/browser_frame_view.mm index 9e973c4..e487cc4 100644 --- a/chrome/browser/ui/cocoa/browser_frame_view.mm +++ b/chrome/browser/ui/cocoa/browser_frame_view.mm @@ -13,7 +13,6 @@ #import "chrome/browser/ui/cocoa/framed_browser_window.h" #import "chrome/browser/ui/cocoa/themed_window.h" #include "grit/theme_resources.h" -#include "grit/theme_resources_standard.h" static const CGFloat kBrowserFrameViewPaintHeight = 60.0; static const NSPoint kBrowserFrameViewPatternPhaseOffset = { -5, 3 }; diff --git a/chrome/browser/ui/cocoa/download/download_shelf_view.mm b/chrome/browser/ui/cocoa/download/download_shelf_view.mm index 0d9c72e..3ab757c 100644 --- a/chrome/browser/ui/cocoa/download/download_shelf_view.mm +++ b/chrome/browser/ui/cocoa/download/download_shelf_view.mm @@ -9,7 +9,6 @@ #import "chrome/browser/ui/cocoa/themed_window.h" #import "chrome/browser/ui/cocoa/view_id_util.h" #include "grit/theme_resources.h" -#include "grit/theme_resources_standard.h" @implementation DownloadShelfView diff --git a/chrome/browser/ui/cocoa/hover_image_button_unittest.mm b/chrome/browser/ui/cocoa/hover_image_button_unittest.mm index 22faa22..e25dc77 100644 --- a/chrome/browser/ui/cocoa/hover_image_button_unittest.mm +++ b/chrome/browser/ui/cocoa/hover_image_button_unittest.mm @@ -8,7 +8,6 @@ #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/hover_image_button.h" #include "grit/theme_resources.h" -#include "grit/theme_resources_standard.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.mm b/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.mm index b9d714e..c3db857 100644 --- a/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.mm +++ b/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.mm @@ -9,7 +9,6 @@ #import "chrome/browser/ui/cocoa/image_utils.h" #include "chrome/browser/ui/omnibox/location_bar_util.h" #include "grit/theme_resources.h" -#include "grit/theme_resources_standard.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util_mac.h" diff --git a/chrome/browser/ui/cocoa/location_bar/star_decoration.mm b/chrome/browser/ui/cocoa/location_bar/star_decoration.mm index c3e1d48..5ae432e 100644 --- a/chrome/browser/ui/cocoa/location_bar/star_decoration.mm +++ b/chrome/browser/ui/cocoa/location_bar/star_decoration.mm @@ -9,7 +9,6 @@ #include "chrome/browser/command_updater.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "grit/theme_resources_standard.h" #include "ui/base/l10n/l10n_util_mac.h" namespace { diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm index baa05f8..783adfa 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm +++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm @@ -54,7 +54,6 @@ #include "grit/app_resources.h" #include "grit/generated_resources.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/l10n/l10n_util.h" diff --git a/chrome/browser/ui/cocoa/tabs/tab_view.mm b/chrome/browser/ui/cocoa/tabs/tab_view.mm index bb86e3c..ecab140 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_view.mm +++ b/chrome/browser/ui/cocoa/tabs/tab_view.mm @@ -15,7 +15,6 @@ #import "chrome/browser/ui/cocoa/view_id_util.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 { diff --git a/chrome/browser/ui/gtk/back_forward_button_gtk.cc b/chrome/browser/ui/gtk/back_forward_button_gtk.cc index 4b2a796..c6c1a98 100644 --- a/chrome/browser/ui/gtk/back_forward_button_gtk.cc +++ b/chrome/browser/ui/gtk/back_forward_button_gtk.cc @@ -16,7 +16,6 @@ #include "chrome/browser/ui/toolbar/back_forward_menu_model.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "grit/theme_resources_standard.h" #include "ui/base/l10n/l10n_util.h" // The time in milliseconds between when the user clicks and the menu appears. diff --git a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc index 9a72fba..c89f3c8 100644 --- a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc +++ b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc @@ -34,7 +34,6 @@ #include "content/common/notification_type.h" #include "grit/app_resources.h" #include "grit/theme_resources.h" -#include "grit/theme_resources_standard.h" #include "ui/gfx/canvas_skia_paint.h" #include "ui/gfx/gtk_util.h" diff --git a/chrome/browser/ui/gtk/browser_titlebar.cc b/chrome/browser/ui/gtk/browser_titlebar.cc index 7e22346..81cab17 100644 --- a/chrome/browser/ui/gtk/browser_titlebar.cc +++ b/chrome/browser/ui/gtk/browser_titlebar.cc @@ -38,7 +38,6 @@ #include "grit/app_resources.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/gtk_util.h" diff --git a/chrome/browser/ui/gtk/browser_toolbar_gtk.cc b/chrome/browser/ui/gtk/browser_toolbar_gtk.cc index d9bf268..2919160 100644 --- a/chrome/browser/ui/gtk/browser_toolbar_gtk.cc +++ b/chrome/browser/ui/gtk/browser_toolbar_gtk.cc @@ -46,7 +46,6 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "grit/theme_resources_standard.h" #include "ui/base/dragdrop/gtk_dnd_util.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/accelerator_gtk.h" diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc index ac24d2c..21010f0 100644 --- a/chrome/browser/ui/gtk/browser_window_gtk.cc +++ b/chrome/browser/ui/gtk/browser_window_gtk.cc @@ -85,7 +85,6 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "grit/theme_resources_standard.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/gtk_util.h" diff --git a/chrome/browser/ui/gtk/gtk_theme_service.cc b/chrome/browser/ui/gtk/gtk_theme_service.cc index ced0710..8e433d6 100644 --- a/chrome/browser/ui/gtk/gtk_theme_service.cc +++ b/chrome/browser/ui/gtk/gtk_theme_service.cc @@ -30,7 +30,6 @@ #include "content/common/notification_type.h" #include "grit/app_resources.h" #include "grit/theme_resources.h" -#include "grit/theme_resources_standard.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkColor.h" diff --git a/chrome/browser/ui/gtk/gtk_util.cc b/chrome/browser/ui/gtk/gtk_util.cc index 69fcbe5..fd520c5 100644 --- a/chrome/browser/ui/gtk/gtk_util.cc +++ b/chrome/browser/ui/gtk/gtk_util.cc @@ -32,7 +32,6 @@ #include "content/common/renderer_preferences.h" #include "googleurl/src/gurl.h" #include "grit/theme_resources.h" -#include "grit/theme_resources_standard.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.cc b/chrome/browser/ui/gtk/location_bar_view_gtk.cc index 0bbe026..70c7c7b 100644 --- a/chrome/browser/ui/gtk/location_bar_view_gtk.cc +++ b/chrome/browser/ui/gtk/location_bar_view_gtk.cc @@ -54,7 +54,6 @@ #include "content/common/page_transition_types.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "grit/theme_resources_standard.h" #include "net/base/net_util.h" #include "ui/base/dragdrop/gtk_dnd_util.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc b/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc index 8e2ce41..82678b3 100644 --- a/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc +++ b/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc @@ -37,7 +37,6 @@ #include "content/common/notification_type.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "grit/theme_resources_standard.h" #include "ui/base/animation/slide_animation.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/gtk/reload_button_gtk.cc b/chrome/browser/ui/gtk/reload_button_gtk.cc index 0401f62..fd001ca 100644 --- a/chrome/browser/ui/gtk/reload_button_gtk.cc +++ b/chrome/browser/ui/gtk/reload_button_gtk.cc @@ -16,7 +16,6 @@ #include "content/common/notification_source.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "grit/theme_resources_standard.h" #include "ui/base/l10n/l10n_util.h" // The width of this button in GTK+ theme mode. The Stop and Refresh stock icons diff --git a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc index 26ed8d4..a3f792a 100644 --- a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc +++ b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc @@ -22,7 +22,6 @@ #include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "grit/theme_resources_standard.h" #include "ui/base/animation/slide_animation.h" #include "ui/base/animation/throb_animation.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc index 8688b10..d5241cd 100644 --- a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc +++ b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc @@ -28,7 +28,6 @@ #include "content/common/notification_type.h" #include "grit/app_resources.h" #include "grit/theme_resources.h" -#include "grit/theme_resources_standard.h" #include "ui/base/animation/animation_delegate.h" #include "ui/base/animation/slide_animation.h" #include "ui/base/dragdrop/gtk_dnd_util.h" diff --git a/chrome/browser/ui/touch/tabs/touch_tab.cc b/chrome/browser/ui/touch/tabs/touch_tab.cc index 11d3b5b..e4ec73f 100644 --- a/chrome/browser/ui/touch/tabs/touch_tab.cc +++ b/chrome/browser/ui/touch/tabs/touch_tab.cc @@ -8,7 +8,6 @@ #include "chrome/browser/themes/theme_service.h" #include "grit/app_resources.h" #include "grit/theme_resources.h" -#include "grit/theme_resources_standard.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas_skia.h" #include "ui/gfx/favicon_size.h" diff --git a/chrome/browser/ui/views/browser_actions_container.cc b/chrome/browser/ui/views/browser_actions_container.cc index 942d92d..3fd12be 100644 --- a/chrome/browser/ui/views/browser_actions_container.cc +++ b/chrome/browser/ui/views/browser_actions_container.cc @@ -29,8 +29,6 @@ #include "content/common/notification_type.h" #include "grit/app_resources.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 "third_party/skia/include/effects/SkGradientShader.h" #include "ui/base/accessibility/accessible_view_state.h" @@ -47,6 +45,8 @@ #include "views/metrics.h" #include "views/window/window.h" +#include "grit/theme_resources.h" + // Horizontal spacing between most items in the container, as well as after the // last item or chevron (if visible). static const int kItemSpacing = ToolbarView::kStandardSpacing; diff --git a/chrome/browser/ui/views/bubble/bubble_border.cc b/chrome/browser/ui/views/bubble/bubble_border.cc index 98c3f3d..1a05b17 100644 --- a/chrome/browser/ui/views/bubble/bubble_border.cc +++ b/chrome/browser/ui/views/bubble/bubble_border.cc @@ -6,7 +6,6 @@ #include "base/logging.h" #include "grit/theme_resources.h" -#include "grit/theme_resources_standard.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas_skia.h" diff --git a/chrome/browser/ui/views/constrained_window_views.cc b/chrome/browser/ui/views/constrained_window_views.cc index 977bfd8..24ad971 100644 --- a/chrome/browser/ui/views/constrained_window_views.cc +++ b/chrome/browser/ui/views/constrained_window_views.cc @@ -19,7 +19,6 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "grit/theme_resources_standard.h" #include "net/base/net_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" diff --git a/chrome/browser/ui/views/detachable_toolbar_view.cc b/chrome/browser/ui/views/detachable_toolbar_view.cc index 04aa0d5..5e92c489 100644 --- a/chrome/browser/ui/views/detachable_toolbar_view.cc +++ b/chrome/browser/ui/views/detachable_toolbar_view.cc @@ -6,7 +6,6 @@ #include "chrome/browser/themes/theme_service.h" #include "grit/theme_resources.h" -#include "grit/theme_resources_standard.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkShader.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/views/find_bar_view.cc b/chrome/browser/ui/views/find_bar_view.cc index 31366ca..1f1d80c 100644 --- a/chrome/browser/ui/views/find_bar_view.cc +++ b/chrome/browser/ui/views/find_bar_view.cc @@ -21,7 +21,6 @@ #include "content/browser/tab_contents/tab_contents.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "grit/theme_resources_standard.h" #include "third_party/skia/include/effects/SkGradientShader.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/views/frame/glass_browser_frame_view.cc b/chrome/browser/ui/views/frame/glass_browser_frame_view.cc index 69604e5..9fa33d5 100644 --- a/chrome/browser/ui/views/frame/glass_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/glass_browser_frame_view.cc @@ -23,7 +23,6 @@ #include "content/common/notification_service.h" #include "grit/app_resources.h" #include "grit/theme_resources.h" -#include "grit/theme_resources_standard.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" #include "ui/gfx/canvas_skia.h" diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc index 20616aa7..3fb7a61 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc @@ -16,7 +16,6 @@ #include "grit/chromium_strings.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/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc index a3f4b82..cb193b8 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc @@ -38,7 +38,6 @@ #include "content/common/notification_service.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/dragdrop/drag_drop_types.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/views/location_bar/star_view.cc b/chrome/browser/ui/views/location_bar/star_view.cc index 8e24153..d531c43 100644 --- a/chrome/browser/ui/views/location_bar/star_view.cc +++ b/chrome/browser/ui/views/location_bar/star_view.cc @@ -11,7 +11,6 @@ #include "chrome/browser/ui/views/browser_dialogs.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/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/views/notifications/balloon_view.cc b/chrome/browser/ui/views/notifications/balloon_view.cc index cdd4a5a..ce59089 100644 --- a/chrome/browser/ui/views/notifications/balloon_view.cc +++ b/chrome/browser/ui/views/notifications/balloon_view.cc @@ -22,7 +22,6 @@ #include "content/common/notification_type.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "grit/theme_resources_standard.h" #include "ui/base/animation/slide_animation.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/views/tabs/base_tab.cc b/chrome/browser/ui/views/tabs/base_tab.cc index 9368313..2e9f222 100644 --- a/chrome/browser/ui/views/tabs/base_tab.cc +++ b/chrome/browser/ui/views/tabs/base_tab.cc @@ -18,7 +18,6 @@ #include "grit/app_resources.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/animation_container.h" #include "ui/base/animation/slide_animation.h" diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc index bafe9a1..424d052 100644 --- a/chrome/browser/ui/views/tabs/tab.cc +++ b/chrome/browser/ui/views/tabs/tab.cc @@ -12,7 +12,6 @@ #include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "grit/theme_resources_standard.h" #include "third_party/skia/include/effects/SkGradientShader.h" #include "ui/base/animation/multi_animation.h" #include "ui/base/animation/slide_animation.h" diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc index 728f3ac..d73e78e 100644 --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc @@ -16,7 +16,6 @@ #include "chrome/browser/ui/views/tabs/tab_strip_controller.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/animation_container.h" #include "ui/base/dragdrop/drag_drop_types.h" diff --git a/chrome/browser/ui/views/theme_background.cc b/chrome/browser/ui/views/theme_background.cc index 982117a..6fd601b 100644 --- a/chrome/browser/ui/views/theme_background.cc +++ b/chrome/browser/ui/views/theme_background.cc @@ -11,7 +11,6 @@ #include "grit/app_resources.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 "views/view.h" diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar_view.cc index c0d4bdb..7c28752 100644 --- a/chrome/browser/ui/views/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar_view.cc @@ -23,7 +23,6 @@ #include "grit/chromium_strings.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/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/webui/theme_source_unittest.cc b/chrome/browser/ui/webui/theme_source_unittest.cc index 1fde842..ce994d6 100644 --- a/chrome/browser/ui/webui/theme_source_unittest.cc +++ b/chrome/browser/ui/webui/theme_source_unittest.cc @@ -9,7 +9,6 @@ #include "chrome/test/testing_profile.h" #include "content/browser/browser_thread.h" #include "grit/theme_resources.h" -#include "grit/theme_resources_standard.h" #include "testing/gtest/include/gtest/gtest.h" // A mock ThemeSource (so we can override SendResponse to get at its data). diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index e460f69..dcbb1e5 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -240,34 +240,6 @@ 'includes': [ '../build/grit_target.gypi' ], }, { - 'target_name': 'theme_resources_large', - 'type': 'none', - 'actions': [ - { - 'action_name': 'theme_resources_large', - 'variables': { - 'grit_grd_file': 'app/theme/theme_resources_large.grd', - }, - 'includes': [ '../build/grit_action.gypi' ], - }, - ], - 'includes': [ '../build/grit_target.gypi' ], - }, - { - 'target_name': 'theme_resources_standard', - 'type': 'none', - 'actions': [ - { - 'action_name': 'theme_resources_standard', - 'variables': { - 'grit_grd_file': 'app/theme/theme_resources_standard.grd', - }, - 'includes': [ '../build/grit_action.gypi' ], - }, - ], - 'includes': [ '../build/grit_target.gypi' ], - }, - { 'target_name': 'platform_locale_settings', 'type': 'none', 'actions': [ @@ -383,7 +355,6 @@ 'chrome_strings', '../net/net.gyp:http_server', 'theme_resources', - 'theme_resources_standard', '../skia/skia.gyp:skia', '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', @@ -1439,7 +1410,6 @@ 'msvs_guid': '1556EF78-C7E6-43C8-951F-F6B43AC0DD12', 'dependencies': [ 'theme_resources', - 'theme_resources_standard', '../base/base.gyp:test_support_base', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', @@ -1528,17 +1498,6 @@ '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak', ], - 'conditions': [ - ['touchui==0', { - 'pak_inputs': [ - '<(grit_out_dir)/theme_resources_standard.pak', - ], - }, { # else: touchui!=0 - 'pak_inputs': [ - '<(grit_out_dir)/theme_resources_large.pak', - ], - }], - ], }, 'inputs': [ '<(repack_path)', diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 88336a6..afdce7c 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -24,8 +24,6 @@ 'safe_browsing_report_proto', 'syncapi', 'theme_resources', - 'theme_resources_large', - 'theme_resources_standard', 'userfeedback_proto', '../app/app.gyp:app_resources', '../build/temp_gyp/googleurl.gyp:googleurl', @@ -3429,8 +3427,6 @@ '<(grit_out_dir)/grit/devtools_resources_map.cc', '<(grit_out_dir)/grit/shared_resources_map.cc', '<(grit_out_dir)/grit/theme_resources_map.cc', - '<(grit_out_dir)/grit/theme_resources_large_map.cc', - '<(grit_out_dir)/grit/theme_resources_standard_map.cc', ], 'conditions': [ ['javascript_engine=="v8"', { diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index 7a83814..7720b0a 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -106,7 +106,6 @@ 'default_plugin/default_plugin.gyp:default_plugin', 'safe_browsing_csd_proto', 'theme_resources', - 'theme_resources_standard', '../app/app.gyp:app_base', '../app/app.gyp:app_resources', '../base/base.gyp:base', diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index d200ad2..46fd3ca 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -117,7 +117,6 @@ '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', @@ -322,7 +321,6 @@ '<(grit_out_dir)/default_plugin_resources/default_plugin_resources.pak', '<(grit_out_dir)/renderer_resources.pak', '<(grit_out_dir)/theme_resources.pak', - '<(grit_out_dir)/theme_resources_standard.pak', '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak', @@ -341,24 +339,6 @@ 'process_outputs_as_mac_bundle_resources': 1, }, { - 'action_name': 'repack_theme_resources_large', - 'variables': { - 'pak_inputs': [ - '<(grit_out_dir)/theme_resources_large.pak', - ], - }, - 'inputs': [ - '<(repack_path)', - '<@(pak_inputs)', - ], - 'outputs': [ - '<(INTERMEDIATE_DIR)/repack/theme_resources_large.pak', - ], - 'action': ['python', '<(repack_path)', '<@(_outputs)', - '<@(pak_inputs)'], - 'process_outputs_as_mac_bundle_resources': 1, - }, - { 'action_name': 'repack_locales', 'process_outputs_as_mac_bundle_resources': 1, 'variables': { diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index c7879a8..cbf8ea0 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -31,7 +31,6 @@ 'app/policy/cloud_policy_codegen.gyp:policy', 'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp', 'theme_resources', - 'theme_resources_standard', '../base/base.gyp:test_support_base', '../content/content.gyp:content_gpu', '../ipc/ipc.gyp:test_support_ipc', @@ -190,8 +189,6 @@ '../content/browser/tab_contents/test_tab_contents.h', '../content/common/notification_observer_mock.cc', '../content/common/notification_observer_mock.h', - '../ui/gfx/image_unittest_util.h', - '../ui/gfx/image_unittest_util.cc', ], 'conditions': [ ['OS=="linux"', { @@ -215,7 +212,6 @@ 'chrome_resources', 'chrome_strings', 'theme_resources', - 'theme_resources_standard', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', ], @@ -355,7 +351,6 @@ 'test_support_common', 'test_support_ui', 'theme_resources', - 'theme_resources_standard', '../base/base.gyp:base', '../skia/skia.gyp:skia', '../third_party/libxml/libxml.gyp:libxml', @@ -542,7 +537,6 @@ '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', @@ -2097,7 +2091,6 @@ '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', @@ -2456,7 +2449,6 @@ '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', # TODO(alekseys): port sidebar to linux/mac. @@ -2610,7 +2602,6 @@ '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', ], @@ -2730,7 +2721,6 @@ 'test_support_common', 'test_support_ui', 'theme_resources', - 'theme_resources_standard', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', @@ -2833,7 +2823,6 @@ 'test_support_common', 'test_support_ui', 'theme_resources', - 'theme_resources_standard', '../base/base.gyp:base', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', @@ -2868,7 +2857,6 @@ 'test_support_common', 'test_support_ui', 'theme_resources', - 'theme_resources_standard', '../base/base.gyp:base', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', @@ -2898,7 +2886,6 @@ 'test_support_common', 'test_support_ui', 'theme_resources', - 'theme_resources_standard', '../base/base.gyp:base', '../net/net.gyp:net', '../skia/skia.gyp:skia', @@ -3186,7 +3173,6 @@ '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', ], 'include_dirs': [ '<(DEPTH)/third_party/wtl/include', @@ -3278,7 +3264,6 @@ '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', @@ -3595,7 +3580,6 @@ 'chrome_resources', 'chrome_strings', 'theme_resources', - 'theme_resources_standard', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', ], diff --git a/tools/grit/grit/format/resource_map.py b/tools/grit/grit/format/resource_map.py index 4527af8..5ae135b 100644 --- a/tools/grit/grit/format/resource_map.py +++ b/tools/grit/grit/format/resource_map.py @@ -49,14 +49,10 @@ class HeaderTopLevel(interface.ItemFormatter): #include <stddef.h> -#ifndef GRIT_RESOURCE_MAP_STRUCT_ -#define GRIT_RESOURCE_MAP_STRUCT_ struct GritResourceMap { const char* const name; int value; }; -#endif // GRIT_RESOURCE_MAP_STRUCT_ - extern const GritResourceMap %(map_name)s[]; extern const size_t %(map_name)sSize; ''' % { 'year': util.GetCurrentYear(), diff --git a/tools/grit/resource_ids b/tools/grit/resource_ids index c871600..b89b95de 100644 --- a/tools/grit/resource_ids +++ b/tools/grit/resource_ids @@ -130,12 +130,5 @@ # This file is generated during the build. "<(SHARED_INTERMEDIATE_DIR)/devtools/devtools_resources.grd": { "includes": [20500], - }, - # All standard and large theme resources should have the same IDs. - "chrome/app/theme/theme_resources_standard.grd": { - "includes": [21000], - }, - "chrome/app/theme/theme_resources_large.grd": { - "includes": [21000], - }, + } } |