Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(63)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/app/theme/theme_resources_standard.grd

Issue 9707001: Ash: Use new toolbar buttons, adjust spacing (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add TODO Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/views/location_bar/location_bar_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/theme/theme_resources_standard.grd
diff --git a/chrome/app/theme/theme_resources_standard.grd b/chrome/app/theme/theme_resources_standard.grd
index 72b68cbe13413a6c9e505051fd80b48f99606dd2..cfd514b1d30c8e11a6fccc7705be401471b508b9 100644
--- a/chrome/app/theme/theme_resources_standard.grd
+++ b/chrome/app/theme/theme_resources_standard.grd
@@ -17,10 +17,20 @@
<include name="IDR_APP_NOTIFICATION_NUB" file="nub.png" type="BINDATA" />
<include name="IDR_APP_NOTIFICATION_NUB_MASK" file="nub_mask.png" type="BINDATA" />
<include name="IDR_APP_NOTIFICATION_SMALL_BUBBLE" file="small_bubble.png" type="BINDATA" />
- <include name="IDR_BACK" file="back.png" type="BINDATA" />
- <include name="IDR_BACK_D" file="back_d.png" type="BINDATA" />
- <include name="IDR_BACK_H" file="back_h.png" type="BINDATA" />
- <include name="IDR_BACK_P" file="back_p.png" type="BINDATA" />
+ <!-- TODO(jamescook): Update all Chrome platforms to use the new art and metrics
+ from Ash, crbug.com/118228 -->
+ <if expr="pp_ifdef('use_ash')">
+ <include name="IDR_BACK" file="ash/browser_back_normal.png" type="BINDATA" />
+ <include name="IDR_BACK_D" file="ash/browser_back_disabled.png" type="BINDATA" />
+ <include name="IDR_BACK_H" file="ash/browser_back_hot.png" type="BINDATA" />
+ <include name="IDR_BACK_P" file="ash/browser_back_pressed.png" type="BINDATA" />
+ </if>
+ <if expr="not pp_ifdef('use_ash')">
+ <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>
<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" />
@@ -30,15 +40,27 @@
<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_BOOKMARKS_FAVICON" file="bookmarks_favicon.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="not is_win">
+ <if expr="pp_ifdef('use_ash')">
+ <include name="IDR_BROWSER_ACTION" file="ash/browser_action_normal.png" type="BINDATA" />
+ <include name="IDR_BROWSER_ACTION_H" file="ash/browser_action_hot.png" type="BINDATA" />
+ <include name="IDR_BROWSER_ACTION_P" file="ash/browser_action_pressed.png" type="BINDATA" />
+ </if>
+ <if expr="not pp_ifdef('use_ash')">
+ <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('use_ash')">
+ <include name="IDR_BROWSER_ACTIONS_OVERFLOW" file="ash/browser_actions_overflow_normal.png" type="BINDATA" />
+ <include name="IDR_BROWSER_ACTIONS_OVERFLOW_H" file="ash/browser_actions_overflow_hot.png" type="BINDATA" />
+ <include name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="ash/browser_actions_overflow_pressed.png" type="BINDATA" />
+ </if>
+ <if expr="not is_win and not pp_ifdef('use_ash')">
<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="is_win">
+ <if expr="is_win and not pp_ifdef('use_ash')">
<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" />
@@ -56,15 +78,30 @@
<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_FLAGS" file="flags.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" />
+ <if expr="pp_ifdef('use_ash')">
+ <include name="IDR_FORWARD" file="ash/browser_forward_normal.png" type="BINDATA" />
+ <include name="IDR_FORWARD_D" file="ash/browser_forward_disabled.png" type="BINDATA" />
+ <include name="IDR_FORWARD_H" file="ash/browser_forward_hot.png" type="BINDATA" />
+ <include name="IDR_FORWARD_P" file="ash/browser_forward_pressed.png" type="BINDATA" />
+ </if>
+ <if expr="not pp_ifdef('use_ash')">
+ <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>
<include name="IDR_GEOLOCATION_INFOBAR_ICON" file="infobar_geolocation.png" type="BINDATA" />
<include name="IDR_HISTORY_FAVICON" file="history_favicon.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" />
+ <if expr="pp_ifdef('use_ash')">
+ <include name="IDR_HOME" file="ash/browser_home_normal.png" type="BINDATA" />
+ <include name="IDR_HOME_H" file="ash/browser_home_hot.png" type="BINDATA" />
+ <include name="IDR_HOME_P" file="ash/browser_home_pressed.png" type="BINDATA" />
+ </if>
+ <if expr="not pp_ifdef('use_ash')">
+ <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>
<include name="IDR_INFOBAR_ALT_NAV_URL" file="infobar_didyoumean.png" type="BINDATA" />
<include name="IDR_INFOBAR_AUTOFILL" file="infobar_autofill.png" type="BINDATA" />
<include name="IDR_INFOBAR_AUTOLOGIN" file="infobar_autologin.png" type="BINDATA" />
@@ -84,10 +121,18 @@
<include name="IDR_INFOBAR_THEME" file="infobar_theme.png" type="BINDATA" />
<include name="IDR_INFOBAR_TRANSLATE" file="infobar_translate.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_BORDER" file="omnibox_border.png" type="BINDATA" />
+ <if expr="pp_ifdef('use_ash')">
+ <include name="IDR_LOCATIONBG_C" file="ash/browser_omnibox_middle.png" type="BINDATA" />
+ <include name="IDR_LOCATIONBG_L" file="ash/browser_omnibox_left.png" type="BINDATA" />
+ <include name="IDR_LOCATIONBG_R" file="ash/browser_omnibox_right.png" type="BINDATA" />
+ <include name="IDR_LOCATION_BAR_BORDER" file="ash/browser_omnibox_border.png" type="BINDATA" />
+ </if>
+ <if expr="not pp_ifdef('use_ash')">
+ <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_BORDER" file="omnibox_border.png" type="BINDATA" />
+ </if>
<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" />
@@ -108,16 +153,31 @@
<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_PLUGIN" file="plugin.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" />
+ <if expr="pp_ifdef('use_ash')">
+ <include name="IDR_RELOAD" file="ash/browser_reload_normal.png" type="BINDATA" />
+ <include name="IDR_RELOAD_H" file="ash/browser_reload_hot.png" type="BINDATA" />
+ <include name="IDR_RELOAD_P" file="ash/browser_reload_pressed.png" type="BINDATA" />
+ </if>
+ <if expr="not pp_ifdef('use_ash')">
+ <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>
<include name="IDR_SAD_FAVICON" file="sadfavicon.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('use_ash')">
+ <include name="IDR_STOP" file="ash/browser_stop_normal.png" type="BINDATA" />
+ <include name="IDR_STOP_D" file="ash/browser_stop_disabled.png" type="BINDATA" />
+ <include name="IDR_STOP_H" file="ash/browser_stop_hot.png" type="BINDATA" />
+ <include name="IDR_STOP_P" file="ash/browser_stop_pressed.png" type="BINDATA" />
+ </if>
+ <if expr="not pp_ifdef('use_ash')">
+ <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>
<include name="IDR_TAB_ACTIVE_CENTER" file="tab_active_center.png" type="BINDATA" />
<include name="IDR_TAB_ACTIVE_LEFT" file="tab_active_left.png" type="BINDATA" />
<include name="IDR_TAB_ACTIVE_RIGHT" file="tab_active_right.png" type="BINDATA" />
@@ -132,31 +192,31 @@
<include name="IDR_TAB_INACTIVE_CENTER" file="tab_inactive_center.png" type="BINDATA" />
<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" />
- <if expr="pp_ifdef('use_aura')">
+ <if expr="pp_ifdef('use_ash')">
<include name="IDR_THEME_FRAME" file="theme_frame_default_aura.png" type="BINDATA" />
<include name="IDR_THEME_FRAME_INACTIVE" file="theme_frame_default_inactive_aura.png" type="BINDATA" />
<include name="IDR_THEME_FRAME_INCOGNITO" file="theme_frame_default_incognito_aura.png" type="BINDATA" />
<include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="theme_frame_default_incognito_aura.png" type="BINDATA" />
</if>
- <if expr="pp_ifdef('chromeos') and not pp_ifdef('use_aura')">
+ <if expr="pp_ifdef('chromeos') and not pp_ifdef('use_ash')">
<include name="IDR_THEME_FRAME" file="theme_frame_default2.png" type="BINDATA" />
<include name="IDR_THEME_FRAME_INACTIVE" file="theme_frame_default2.png" type="BINDATA" />
<include name="IDR_THEME_FRAME_INCOGNITO" file="theme_frame_default2_incognito.png" type="BINDATA" />
<include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="theme_frame_default2_incognito.png" type="BINDATA" />
</if>
- <if expr="not pp_ifdef('chromeos') and not pp_ifdef('use_aura')">
+ <if expr="not pp_ifdef('chromeos') and not pp_ifdef('use_ash')">
<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" />
</if>
- <if expr="pp_ifdef('use_aura')">
+ <if expr="pp_ifdef('use_ash')">
<include name="IDR_THEME_TAB_BACKGROUND" file="theme_tab_background_aura.png" type="BINDATA" />
</if>
- <if expr="pp_ifdef('chromeos') and not pp_ifdef('use_aura')">
+ <if expr="pp_ifdef('chromeos') and not pp_ifdef('use_ash')">
<include name="IDR_THEME_TAB_BACKGROUND" file="theme_tab_background2.png" type="BINDATA" />
</if>
- <if expr="not pp_ifdef('chromeos') and not pp_ifdef('use_aura')">
+ <if expr="not pp_ifdef('chromeos') and not pp_ifdef('use_ash')">
<include name="IDR_THEME_TAB_BACKGROUND" file="theme_tab_background.png" type="BINDATA" />
</if>
<if expr="pp_ifdef('chromeos') or is_macosx">
« no previous file with comments | « no previous file | chrome/browser/ui/views/location_bar/location_bar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698