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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 10310115: app/theme images for 2x touch (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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
« chrome/app/theme/theme_resources_2x.grd ('K') | « chrome/app/theme/theme_resources_2x.grd ('k') | chrome/app/theme/theme_resources_touch_1x.grd » ('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 8e831c4d55ea45af9d8d354cb1bb2d6304d6d676..613a33acd0aecede6429da13640bb22924b6ba28 100644
--- a/chrome/app/theme/theme_resources_standard.grd
+++ b/chrome/app/theme/theme_resources_standard.grd
@@ -21,10 +21,10 @@
<!-- TODO(jamescook): Update all Chrome platforms to use the new art and metrics
from Ash, crbug.com/118228 -->
<if expr="pp_ifdef('toolkit_views')">
- <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" />
+ <include name="IDR_BACK" file="ash_100/browser_back_normal.png" type="BINDATA" />
+ <include name="IDR_BACK_D" file="ash_100/browser_back_disabled.png" type="BINDATA" />
+ <include name="IDR_BACK_H" file="ash_100/browser_back_hover.png" type="BINDATA" />
+ <include name="IDR_BACK_P" file="ash_100/browser_back_pressed.png" type="BINDATA" />
</if>
<if expr="not pp_ifdef('toolkit_views')">
<include name="IDR_BACK" file="back.png" type="BINDATA" />
@@ -42,9 +42,9 @@
<include name="IDR_BLOCKED_POPUPS" file="blocked_popups.png" type="BINDATA" />
<include name="IDR_BOOKMARKS_FAVICON" file="bookmarks_favicon.png" type="BINDATA" />
<if expr="pp_ifdef('toolkit_views')">
- <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" />
+ <include name="IDR_BROWSER_ACTION" file="ash_100/browser_action_normal.png" type="BINDATA" />
+ <include name="IDR_BROWSER_ACTION_H" file="ash_100/browser_action_hover.png" type="BINDATA" />
+ <include name="IDR_BROWSER_ACTION_P" file="ash_100/browser_action_pressed.png" type="BINDATA" />
</if>
<if expr="not pp_ifdef('toolkit_views')">
<include name="IDR_BROWSER_ACTION" file="browser_action.png" type="BINDATA" />
@@ -52,9 +52,9 @@
<include name="IDR_BROWSER_ACTION_P" file="browser_action_p.png" type="BINDATA" />
</if>
<if expr="pp_ifdef('toolkit_views')">
- <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" />
+ <include name="IDR_BROWSER_ACTIONS_OVERFLOW" file="ash_100/browser_actions_overflow_normal.png" type="BINDATA" />
+ <include name="IDR_BROWSER_ACTIONS_OVERFLOW_H" file="ash_100/browser_actions_overflow_hover.png" type="BINDATA" />
+ <include name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="ash_100/browser_actions_overflow_pressed.png" type="BINDATA" />
</if>
<if expr="not pp_ifdef('toolkit_views')">
<include name="IDR_BROWSER_ACTIONS_OVERFLOW" file="browser_actions_overflow.png" type="BINDATA" />
@@ -66,7 +66,7 @@
</if>
<!-- Ash doesn't draw rounded content area, so needs a special top image. -->
<if expr="pp_ifdef('use_ash')">
- <include name="IDR_CONTENT_TOP_CENTER" file="ash/content_top_center.png" type="BINDATA" />
+ <include name="IDR_CONTENT_TOP_CENTER" file="ash_100/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" />
@@ -81,10 +81,10 @@
<include name="IDR_FEEDBACK_P" file="feedback_p.png" type="BINDATA" />
<include name="IDR_FLAGS" file="flags.png" type="BINDATA" />
<if expr="pp_ifdef('toolkit_views')">
- <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" />
+ <include name="IDR_FORWARD" file="ash_100/browser_forward_normal.png" type="BINDATA" />
+ <include name="IDR_FORWARD_D" file="ash_100/browser_forward_disabled.png" type="BINDATA" />
+ <include name="IDR_FORWARD_H" file="ash_100/browser_forward_hover.png" type="BINDATA" />
+ <include name="IDR_FORWARD_P" file="ash_100/browser_forward_pressed.png" type="BINDATA" />
</if>
<if expr="not pp_ifdef('toolkit_views')">
<include name="IDR_FORWARD" file="forward.png" type="BINDATA" />
@@ -95,9 +95,9 @@
<include name="IDR_GEOLOCATION_INFOBAR_ICON" file="infobar_geolocation.png" type="BINDATA" />
<include name="IDR_HISTORY_FAVICON" file="history_favicon.png" type="BINDATA" />
<if expr="pp_ifdef('toolkit_views')">
- <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" />
+ <include name="IDR_HOME" file="ash_100/browser_home_normal.png" type="BINDATA" />
+ <include name="IDR_HOME_H" file="ash_100/browser_home_hover.png" type="BINDATA" />
+ <include name="IDR_HOME_P" file="ash_100/browser_home_pressed.png" type="BINDATA" />
</if>
<if expr="not pp_ifdef('toolkit_views')">
<include name="IDR_HOME" file="home.png" type="BINDATA" />
@@ -124,10 +124,10 @@
<include name="IDR_INFOBAR_TRANSLATE" file="infobar_translate.png" type="BINDATA" />
<include name="IDR_KEYWORD_SEARCH_MAGNIFIER" file="keyword_search_magnifier.png" type="BINDATA" />
<if expr="pp_ifdef('toolkit_views')">
- <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" />
+ <include name="IDR_LOCATIONBG_C" file="ash_100/browser_omnibox_middle.png" type="BINDATA" />
+ <include name="IDR_LOCATIONBG_L" file="ash_100/browser_omnibox_left.png" type="BINDATA" />
+ <include name="IDR_LOCATIONBG_R" file="ash_100/browser_omnibox_right.png" type="BINDATA" />
+ <include name="IDR_LOCATION_BAR_BORDER" file="ash_100/browser_omnibox_border.png" type="BINDATA" />
</if>
<if expr="not pp_ifdef('toolkit_views')">
<include name="IDR_LOCATIONBG_C" file="omnibox_c.png" type="BINDATA" />
@@ -141,10 +141,10 @@
<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')">
- <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" />
+ <include name="IDR_NEWTAB_BUTTON" file="ash_100/newtab_normal.png" type="BINDATA" />
+ <include name="IDR_NEWTAB_BUTTON_H" file="ash_100/newtab_hover.png" type="BINDATA" />
+ <include name="IDR_NEWTAB_BUTTON_P" file="ash_100/newtab_pressed.png" type="BINDATA" />
+ <include name="IDR_NEWTAB_BUTTON_MASK" file="ash_100/newtab_button_mask.png" type="BINDATA" />
</if>
<if expr="not pp_ifdef('toolkit_views')">
<include name="IDR_NEWTAB_BUTTON" file="newtab.png" type="BINDATA" />
@@ -158,9 +158,9 @@
<include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_R" file="ev_bubble_r.png" type="BINDATA" />
<include name="IDR_PLUGIN" file="plugin.png" type="BINDATA" />
<if expr="pp_ifdef('toolkit_views')">
- <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" />
+ <include name="IDR_RELOAD" file="ash_100/browser_reload_normal.png" type="BINDATA" />
+ <include name="IDR_RELOAD_H" file="ash_100/browser_reload_hover.png" type="BINDATA" />
+ <include name="IDR_RELOAD_P" file="ash_100/browser_reload_pressed.png" type="BINDATA" />
</if>
<if expr="not pp_ifdef('toolkit_views')">
<include name="IDR_RELOAD" file="reload.png" type="BINDATA" />
@@ -171,10 +171,10 @@
<include name="IDR_STAR" file="star.png" type="BINDATA" />
<include name="IDR_STAR_LIT" file="star_lit.png" type="BINDATA" />
<if expr="pp_ifdef('toolkit_views')">
- <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" />
+ <include name="IDR_STOP" file="ash_100/browser_stop_normal.png" type="BINDATA" />
+ <include name="IDR_STOP_D" file="ash_100/browser_stop_disabled.png" type="BINDATA" />
+ <include name="IDR_STOP_H" file="ash_100/browser_stop_hover.png" type="BINDATA" />
+ <include name="IDR_STOP_P" file="ash_100/browser_stop_pressed.png" type="BINDATA" />
</if>
<if expr="not pp_ifdef('toolkit_views')">
<include name="IDR_STOP" file="stop.png" type="BINDATA" />
@@ -183,11 +183,11 @@
<include name="IDR_STOP_P" file="stop_p.png" type="BINDATA" />
</if>
<if expr="pp_ifdef('toolkit_views')">
- <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" />
+ <include name="IDR_TAB_ACTIVE_CENTER" file="ash_100/tab_active_center.png" type="BINDATA" />
+ <include name="IDR_TAB_ACTIVE_LEFT" file="ash_100/tab_active_left.png" type="BINDATA" />
+ <include name="IDR_TAB_ACTIVE_RIGHT" file="ash_100/tab_active_right.png" type="BINDATA" />
+ <include name="IDR_TAB_ALPHA_LEFT" file="ash_100/tab_alpha_left.png" type="BINDATA" />
+ <include name="IDR_TAB_ALPHA_RIGHT" file="ash_100/tab_alpha_right.png" type="BINDATA" />
</if>
<if expr="not pp_ifdef('toolkit_views')">
<include name="IDR_TAB_ACTIVE_CENTER" file="tab_active_center.png" type="BINDATA" />
@@ -200,10 +200,10 @@
fill a background with a color from the theme, tile IDR_TAB_CLOSE over it,
then apply IDR_TAB_CLOSE_MASK. See chrome/browser/ui/views/tabs/tab.cc -->
<if expr="pp_ifdef('toolkit_views')">
- <include name="IDR_TAB_CLOSE" file="ash/tab_close_normal.png" type="BINDATA" />
- <include name="IDR_TAB_CLOSE_H" file="ash/tab_close_hot.png" type="BINDATA" />
- <include name="IDR_TAB_CLOSE_MASK" file="ash/tab_close_mask.png" type="BINDATA" />
- <include name="IDR_TAB_CLOSE_P" file="ash/tab_close_pressed.png" type="BINDATA" />
+ <include name="IDR_TAB_CLOSE" file="ash_100/tab_close_normal.png" type="BINDATA" />
+ <include name="IDR_TAB_CLOSE_H" file="ash_100/tab_close_hover.png" type="BINDATA" />
+ <include name="IDR_TAB_CLOSE_MASK" file="ash_100/tab_close_mask.png" type="BINDATA" />
+ <include name="IDR_TAB_CLOSE_P" file="ash_100/tab_close_pressed.png" type="BINDATA" />
</if>
<if expr="not pp_ifdef('toolkit_views')">
<include name="IDR_TAB_CLOSE" file="tab_close.png" type="BINDATA" />
@@ -214,9 +214,9 @@
<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" />
<if expr="pp_ifdef('toolkit_views')">
- <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" />
+ <include name="IDR_TAB_INACTIVE_CENTER" file="ash_100/tab_inactive_center.png" type="BINDATA" />
+ <include name="IDR_TAB_INACTIVE_LEFT" file="ash_100/tab_inactive_left.png" type="BINDATA" />
+ <include name="IDR_TAB_INACTIVE_RIGHT" file="ash_100/tab_inactive_right.png" type="BINDATA" />
</if>
<if expr="not pp_ifdef('toolkit_views')">
<include name="IDR_TAB_INACTIVE_CENTER" file="tab_inactive_center.png" type="BINDATA" />
@@ -225,10 +225,10 @@
</if>
<!-- Ash has a gray frame, Windows uses blue. -->
<if expr="pp_ifdef('use_ash')">
- <include name="IDR_THEME_FRAME" file="ash/theme_default_active.png" type="BINDATA" />
- <include name="IDR_THEME_FRAME_INACTIVE" file="ash/theme_default_inactive.png" type="BINDATA" />
- <include name="IDR_THEME_FRAME_INCOGNITO" file="ash/theme_incognito_active.png" type="BINDATA" />
- <include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="ash/theme_incognito_inactive.png" type="BINDATA" />
+ <include name="IDR_THEME_FRAME" file="ash_100/theme_frame_default_active.png" type="BINDATA" />
+ <include name="IDR_THEME_FRAME_INACTIVE" file="ash_100/theme_frame_default_inactive.png" type="BINDATA" />
+ <include name="IDR_THEME_FRAME_INCOGNITO" file="ash_100/theme_frame_incognito_active.png" type="BINDATA" />
+ <include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="ash_100/theme_frame_incognito_inactive.png" type="BINDATA" />
</if>
<if expr="not pp_ifdef('use_ash')">
<include name="IDR_THEME_FRAME" file="theme_frame.png" type="BINDATA" />
@@ -238,14 +238,14 @@
</if>
<!-- Ash has gray tab backgrounds, Windows uses blue. -->
<if expr="pp_ifdef('use_ash')">
- <include name="IDR_THEME_TAB_BACKGROUND" file="ash/theme_tab_background.png" type="BINDATA" />
+ <include name="IDR_THEME_TAB_BACKGROUND" file="ash_100/theme_tab_background.png" type="BINDATA" />
</if>
<if expr="not pp_ifdef('use_ash')">
<include name="IDR_THEME_TAB_BACKGROUND" file="theme_tab_background.png" type="BINDATA" />
</if>
<!-- Ash has a dark gray toolbar background, Windows has light gray. -->
<if expr="pp_ifdef('use_ash')">
- <include name="IDR_THEME_TOOLBAR" file="ash/theme_toolbar_default.png" type="BINDATA" />
+ <include name="IDR_THEME_TOOLBAR" file="ash_100/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" />
@@ -258,9 +258,9 @@
</if>
<include name="IDR_THROBBER_WAITING" file="throbber_waiting.png" type="BINDATA" />
<if expr="pp_ifdef('toolkit_views')">
- <include name="IDR_TOOLS" file="ash/browser_tools_normal.png" type="BINDATA" />
- <include name="IDR_TOOLS_H" file="ash/browser_tools_hot.png" type="BINDATA" />
- <include name="IDR_TOOLS_P" file="ash/browser_tools_pressed.png" type="BINDATA" />
+ <include name="IDR_TOOLS" file="ash_100/browser_tools_normal.png" type="BINDATA" />
+ <include name="IDR_TOOLS_H" file="ash_100/browser_tools_hover.png" type="BINDATA" />
+ <include name="IDR_TOOLS_P" file="ash_100/browser_tools_pressed.png" type="BINDATA" />
</if>
<if expr="not pp_ifdef('toolkit_views')">
<include name="IDR_TOOLS" file="tools.png" type="BINDATA" />
« chrome/app/theme/theme_resources_2x.grd ('K') | « chrome/app/theme/theme_resources_2x.grd ('k') | chrome/app/theme/theme_resources_touch_1x.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698