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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 9814013: Ash: Update tab strip for new image assets (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | « chrome/app/theme/theme_resources_2x.grd ('k') | chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.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 cd2735f4277dc37b6a1f3610cb56fd614fa22cf2..041460e1c84cfed54150f44da7edb8e67ebd48ed 100644
--- a/chrome/app/theme/theme_resources_standard.grd
+++ b/chrome/app/theme/theme_resources_standard.grd
@@ -69,7 +69,12 @@
<if expr="is_win">
<include name="IDR_CONFLICT_FAVICON" file="about_conflicts_favicon.png" type="BINDATA" />
</if>
- <include name="IDR_CONTENT_TOP_CENTER" file="content_top_center.png" type="BINDATA" />
+ <if expr="pp_ifdef('use_ash')">
+ <include name="IDR_CONTENT_TOP_CENTER" file="ash/content_top_center.png" type="BINDATA" />
+ </if>
+ <if expr="not pp_ifdef('use_ash')">
+ <include name="IDR_CONTENT_TOP_CENTER" file="content_top_center.png" type="BINDATA" />
+ </if>
<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" />
@@ -139,16 +144,24 @@
<include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_R" file="keyword_search_bubble_r.png" type="BINDATA" />
<include name="IDR_MOBILE" file="mobile.png" type="BINDATA" />
<include name="IDR_MOBILE_LIT" file="mobile_lit.png" type="BINDATA" />
- <if expr="pp_ifdef('toolkit_views')">
+ <if expr="pp_ifdef('use_ash')">
+ <include name="IDR_NEWTAB_BUTTON" file="ash/newtab_normal.png" type="BINDATA" />
+ <include name="IDR_NEWTAB_BUTTON_H" file="ash/newtab_hot.png" type="BINDATA" />
+ <include name="IDR_NEWTAB_BUTTON_P" file="ash/newtab_pressed.png" type="BINDATA" />
+ <include name="IDR_NEWTAB_BUTTON_MASK" file="ash/newtab_button_mask.png" type="BINDATA" />
+ </if>
+ <if expr="not pp_ifdef('use_ash') and pp_ifdef('toolkit_views')">
<include name="IDR_NEWTAB_BUTTON" file="newtab_views.png" type="BINDATA" />
+ <!-- No hot state. -->
<include name="IDR_NEWTAB_BUTTON_P" file="newtab_p_views.png" type="BINDATA" />
+ <include name="IDR_NEWTAB_BUTTON_MASK" file="newtab_button_mask.png" type="BINDATA" />
</if>
- <if expr="not pp_ifdef('toolkit_views')">
+ <if expr="not pp_ifdef('use_ash') and not pp_ifdef('toolkit_views')">
<include name="IDR_NEWTAB_BUTTON" file="newtab.png" type="BINDATA" />
<include name="IDR_NEWTAB_BUTTON_H" file="newtab_h.png" type="BINDATA" />
<include name="IDR_NEWTAB_BUTTON_P" file="newtab_p.png" type="BINDATA" />
+ <include name="IDR_NEWTAB_BUTTON_MASK" file="newtab_button_mask.png" type="BINDATA" />
</if>
- <include name="IDR_NEWTAB_BUTTON_MASK" file="newtab_button_mask.png" type="BINDATA" />
<include name="IDR_SETTINGS_FAVICON" file="settings_favicon.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" />
@@ -179,20 +192,36 @@
<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" />
- <include name="IDR_TAB_ALPHA_LEFT" file="tab_alpha_left.png" type="BINDATA" />
- <include name="IDR_TAB_ALPHA_RIGHT" file="tab_alpha_right.png" type="BINDATA" />
+ <if expr="pp_ifdef('use_ash')">
+ <include name="IDR_TAB_ACTIVE_CENTER" file="ash/tab_active_center.png" type="BINDATA" />
+ <include name="IDR_TAB_ACTIVE_LEFT" file="ash/tab_active_left.png" type="BINDATA" />
+ <include name="IDR_TAB_ACTIVE_RIGHT" file="ash/tab_active_right.png" type="BINDATA" />
+ <include name="IDR_TAB_ALPHA_LEFT" file="ash/tab_alpha_left.png" type="BINDATA" />
+ <include name="IDR_TAB_ALPHA_RIGHT" file="ash/tab_alpha_right.png" type="BINDATA" />
+ </if>
+ <if expr="not pp_ifdef('use_ash')">
+ <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" />
+ <include name="IDR_TAB_ALPHA_LEFT" file="tab_alpha_left.png" type="BINDATA" />
+ <include name="IDR_TAB_ALPHA_RIGHT" file="tab_alpha_right.png" type="BINDATA" />
+ </if>
<include name="IDR_TAB_CLOSE" file="tab_close.png" type="BINDATA" />
<include name="IDR_TAB_CLOSE_H" file="tab_close_h.png" type="BINDATA" />
<include name="IDR_TAB_CLOSE_MASK" file="tab_close_mask.png" type="BINDATA" />
<include name="IDR_TAB_CLOSE_P" file="tab_close_p.png" type="BINDATA" />
<include name="IDR_TAB_DROP_DOWN" file="tab_drop_down.png" type="BINDATA" />
<include name="IDR_TAB_DROP_UP" file="tab_drop_up.png" type="BINDATA" />
- <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_ash')">
+ <include name="IDR_TAB_INACTIVE_CENTER" file="ash/tab_inactive_center.png" type="BINDATA" />
+ <include name="IDR_TAB_INACTIVE_LEFT" file="ash/tab_inactive_left.png" type="BINDATA" />
+ <include name="IDR_TAB_INACTIVE_RIGHT" file="ash/tab_inactive_right.png" type="BINDATA" />
+ </if>
+ <if expr="not pp_ifdef('use_ash')">
+ <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>
<if expr="pp_ifdef('use_ash')">
<include name="IDR_THEME_FRAME" file="ash/theme_frame.png" type="BINDATA" />
<include name="IDR_THEME_FRAME_INACTIVE" file="ash/theme_frame_inactive.png" type="BINDATA" />
@@ -211,7 +240,10 @@
<if expr="not pp_ifdef('use_ash')">
<include name="IDR_THEME_TAB_BACKGROUND" file="theme_tab_background.png" type="BINDATA" />
</if>
- <if expr="pp_ifdef('use_ash') or is_macosx">
+ <if expr="pp_ifdef('use_ash')">
+ <include name="IDR_THEME_TOOLBAR" file="ash/theme_toolbar_default.png" type="BINDATA" />
+ </if>
+ <if expr="not pp_ifdef('use_ash') and is_macosx">
<include name="IDR_THEME_TOOLBAR" file="theme_toolbar_default2.png" type="BINDATA" />
</if>
<if expr="not pp_ifdef('use_ash') and not is_macosx">
« no previous file with comments | « chrome/app/theme/theme_resources_2x.grd ('k') | chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698