diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-13 22:57:27 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-13 22:57:27 +0000 |
| commit | 903e37906e0e0ad6c7627dabeaac1a87e6e31552 (patch) | |
| tree | fdeb7050028649b5223e2cb1ce562306816f4944 /chrome/app/theme/theme_resources.grd | |
| parent | 3cdf37690c508a8251f0893e0a757b2fa50f7f2a (diff) | |
| download | chromium_src-903e37906e0e0ad6c7627dabeaac1a87e6e31552.zip chromium_src-903e37906e0e0ad6c7627dabeaac1a87e6e31552.tar.gz chromium_src-903e37906e0e0ad6c7627dabeaac1a87e6e31552.tar.bz2 | |
Clean up app_resources.grd:
* Alphabetize a couple entries
* Move things to theme_resources.grd where possible; also fixes problems in chrome.gyp and theme_resources.grd that were causing "toolkit_views" to not be properly handled here, so this won't cause problems
* Scope things only used by views under an appropriate conditional
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/2987003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52238 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/theme/theme_resources.grd')
| -rw-r--r-- | chrome/app/theme/theme_resources.grd | 48 |
1 files changed, 40 insertions, 8 deletions
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd index e1e690c..20b8924 100644 --- a/chrome/app/theme/theme_resources.grd +++ b/chrome/app/theme/theme_resources.grd @@ -198,6 +198,7 @@ <include name="IDR_INFOBAR_TRANSLATE" file="chromium/infobar_translate.png" type="BINDATA" /> </if> <include name="IDR_INFO_BUBBLE_CLOSE" file="bubble_close.png" type="BINDATA" /> + <include name="IDR_INPUT_ALERT" file="input_alert.png" type="BINDATA" /> <include name="IDR_LOCATIONBG_C" file="locationbg_c.png" type="BINDATA" /> <include name="IDR_LOCATIONBG_L" file="locationbg_l.png" type="BINDATA" /> <include name="IDR_LOCATIONBG_POPUPMODE_CENTER" file="locationbg_readonly_center.png" type="BINDATA" /> @@ -380,13 +381,13 @@ <include name="IDR_TAB_INACTIVE_NANO_RIGHT" file="tab_inactive_nano_right.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') or pp_ifdef('toolkit_views')"> + <if expr="pp_ifdef('chromeos')"> <include name="IDR_THEME_FRAME" file="theme_frame_default2.png" type="BINDATA" /> <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') and not pp_ifdef('toolkit_views')"> + <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" /> @@ -396,18 +397,18 @@ <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') or pp_ifdef('toolkit_views')"> + <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') and not pp_ifdef('toolkit_views')"> + <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') or pp_ifdef('toolkit_views')"> + <if expr="pp_ifdef('chromeos')"> <include name="IDR_THEME_TOOLBAR" file="theme_toolbar_default2.png" type="BINDATA" /> </if> - <if expr="not pp_ifdef('chromeos') and not pp_ifdef('toolkit_views')"> + <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" /> @@ -429,11 +430,43 @@ <include name="IDR_WIZARD_ICON_RTL" file="chromium/wizard_icon_rtl.png" type="BINDATA" /> </if> + <!-- Images only used by the Views toolkit. --> + <if expr="pp_ifdef('toolkit_views')"> + <include name="IDR_INFOBARBUTTON_BOTTOM_LEFT_H" file="infobarbutton_bl_h.png" type="BINDATA" /> + <include name="IDR_INFOBARBUTTON_BOTTOM_LEFT_N" file="infobarbutton_bl_n.png" type="BINDATA" /> + <include name="IDR_INFOBARBUTTON_BOTTOM_LEFT_P" file="infobarbutton_bl_p.png" type="BINDATA" /> + <include name="IDR_INFOBARBUTTON_BOTTOM_H" file="infobarbutton_b_h.png" type="BINDATA" /> + <include name="IDR_INFOBARBUTTON_BOTTOM_N" file="infobarbutton_b_n.png" type="BINDATA" /> + <include name="IDR_INFOBARBUTTON_BOTTOM_P" file="infobarbutton_b_p.png" type="BINDATA" /> + <include name="IDR_INFOBARBUTTON_BOTTOM_RIGHT_H" file="infobarbutton_br_h.png" type="BINDATA" /> + <include name="IDR_INFOBARBUTTON_BOTTOM_RIGHT_N" file="infobarbutton_br_n.png" type="BINDATA" /> + <include name="IDR_INFOBARBUTTON_BOTTOM_RIGHT_P" file="infobarbutton_br_p.png" type="BINDATA" /> + <include name="IDR_INFOBARBUTTON_CENTER_H" file="infobarbutton_c_h.png" type="BINDATA" /> + <include name="IDR_INFOBARBUTTON_CENTER_N" file="infobarbutton_c_n.png" type="BINDATA" /> + <include name="IDR_INFOBARBUTTON_CENTER_P" file="infobarbutton_c_p.png" type="BINDATA" /> + <include name="IDR_INFOBARBUTTON_LEFT_H" file="infobarbutton_l_h.png" type="BINDATA" /> + <include name="IDR_INFOBARBUTTON_LEFT_P" file="infobarbutton_l_p.png" type="BINDATA" /> + <include name="IDR_INFOBARBUTTON_LEFT_N" file="infobarbutton_l_n.png" type="BINDATA" /> + <include name="IDR_INFOBARBUTTON_MENU_DROPARROW" file="infobarbutton_menu_droparrow.png" type="BINDATA" /> + <include name="IDR_INFOBARBUTTON_RIGHT_H" file="infobarbutton_r_h.png" type="BINDATA" /> + <include name="IDR_INFOBARBUTTON_RIGHT_N" file="infobarbutton_r_n.png" type="BINDATA" /> + <include name="IDR_INFOBARBUTTON_RIGHT_P" file="infobarbutton_r_p.png" type="BINDATA" /> + <include name="IDR_INFOBARBUTTON_TOP_H" file="infobarbutton_t_h.png" type="BINDATA" /> + <include name="IDR_INFOBARBUTTON_TOP_LEFT_H" file="infobarbutton_tl_h.png" type="BINDATA" /> + <include name="IDR_INFOBARBUTTON_TOP_LEFT_N" file="infobarbutton_tl_n.png" type="BINDATA" /> + <include name="IDR_INFOBARBUTTON_TOP_LEFT_P" file="infobarbutton_tl_p.png" type="BINDATA" /> + <include name="IDR_INFOBARBUTTON_TOP_N" file="infobarbutton_t_n.png" type="BINDATA" /> + <include name="IDR_INFOBARBUTTON_TOP_P" file="infobarbutton_t_p.png" type="BINDATA" /> + <include name="IDR_INFOBARBUTTON_TOP_RIGHT_H" file="infobarbutton_tr_h.png" type="BINDATA" /> + <include name="IDR_INFOBARBUTTON_TOP_RIGHT_N" file="infobarbutton_tr_n.png" type="BINDATA" /> + <include name="IDR_INFOBARBUTTON_TOP_RIGHT_P" file="infobarbutton_tr_p.png" type="BINDATA" /> + </if> + <if expr="pp_ifdef('chromeos')"> <include name="IDR_NOTIFICATION_MENU" file="notification_menu.png" type="BINDATA" /> </if> - <if expr="pp_ifdef('chromeos') or pp_ifdef('toolkit_views')"> + <if expr="pp_ifdef('chromeos')"> <include name="IDR_COMPACTNAV_BACK" file="compactnav_back.png" type="BINDATA" /> <include name="IDR_COMPACTNAV_FORWARD" file="compactnav_forward.png" type="BINDATA" /> <include name="IDR_COMPACTNAV_SEPARATOR" file="compactnav_separator.png" type="BINDATA" /> @@ -524,7 +557,6 @@ <include name="IDR_STATUSBAR_NETWORK_WIRED_PRESSED" file="statusbar_network_wired_pressed.png" type="BINDATA" /> <include name="IDR_STATUSBAR_WIRED" file="statusbar_wired.png" type="BINDATA" /> <include name="IDR_STATUSBAR_WIRED_BLACK" file="statusbar_wiredb.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_WIRED_BLACK" file="statusbar_wiredb.png" type="BINDATA" /> <include name="IDR_USER_IMAGE_NO_VIDEO" file="login_other.png" type="BINDATA" /> <include name="IDR_VOLUMEBUBBLE_ICON" file="volume_icon.png" type="BINDATA" /> </if> |