Skip to content

GitLab

T
tangled
Commit 797961dd authored by jamescook@chromium.org's avatar jamescook@chromium.org
Browse files
Options

Ash: New assets for toolbar icons 

* Added special Ash version of tab close button, currently the same as non-Ash but more art will follow.
* Made theme frame filenames more consistent.

Part 1 of many patches coming for Ash toolbar updates.

BUG=115234
TEST=visual
TBR=sky@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10217014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133922 0039d316-1c4b-4281-b951-d872f2087c98
parent fa202f3e
Show whitespace changes
Inline Side-by-side
Showing with 51 additions and 24 deletions
chrome/app/theme/ash/newtab_hot.png
View replaced file @ fa202f3e View file @ 797961dd
chrome/app/theme/ash/newtab_hot.png

1.59 KB | W: | H:

chrome/app/theme/ash/newtab_hot.png

1.71 KB | W: | H:

chrome/app/theme/ash/newtab_hot.png
chrome/app/theme/ash/newtab_hot.png
chrome/app/theme/ash/newtab_hot.png
chrome/app/theme/ash/newtab_hot.png
  • 2-up
  • Swipe
  • Onion skin
chrome/app/theme/ash/newtab_pressed.png
View replaced file @ fa202f3e View file @ 797961dd
chrome/app/theme/ash/newtab_pressed.png

1.35 KB | W: | H:

chrome/app/theme/ash/newtab_pressed.png

1.46 KB | W: | H:

chrome/app/theme/ash/newtab_pressed.png
chrome/app/theme/ash/newtab_pressed.png
chrome/app/theme/ash/newtab_pressed.png
chrome/app/theme/ash/newtab_pressed.png
  • 2-up
  • Swipe
  • Onion skin
chrome/app/theme/ash/tab_active_center.png
View replaced file @ fa202f3e View file @ 797961dd
chrome/app/theme/ash/tab_active_center.png

1010 Bytes | W: | H:

chrome/app/theme/ash/tab_active_center.png

1.03 KB | W: | H:

chrome/app/theme/ash/tab_active_center.png
chrome/app/theme/ash/tab_active_center.png
chrome/app/theme/ash/tab_active_center.png
chrome/app/theme/ash/tab_active_center.png
  • 2-up
  • Swipe
  • Onion skin
chrome/app/theme/ash/tab_alpha_left.png
View replaced file @ fa202f3e View file @ 797961dd
chrome/app/theme/ash/tab_alpha_left.png

339 Bytes | W: | H:

chrome/app/theme/ash/tab_alpha_left.png

1.2 KB | W: | H:

chrome/app/theme/ash/tab_alpha_left.png
chrome/app/theme/ash/tab_alpha_left.png
chrome/app/theme/ash/tab_alpha_left.png
chrome/app/theme/ash/tab_alpha_left.png
  • 2-up
  • Swipe
  • Onion skin
chrome/app/theme/ash/tab_alpha_right.png
View replaced file @ fa202f3e View file @ 797961dd
chrome/app/theme/ash/tab_alpha_right.png

337 Bytes | W: | H:

chrome/app/theme/ash/tab_alpha_right.png

1.21 KB | W: | H:

chrome/app/theme/ash/tab_alpha_right.png
chrome/app/theme/ash/tab_alpha_right.png
chrome/app/theme/ash/tab_alpha_right.png
chrome/app/theme/ash/tab_alpha_right.png
  • 2-up
  • Swipe
  • Onion skin
chrome/app/theme/ash/toolbar_shade_top.png
View replaced file @ fa202f3e View file @ 797961dd
chrome/app/theme/ash/toolbar_shade_top.png

1003 Bytes | W: | H:

chrome/app/theme/ash/toolbar_shade_top.png

1.02 KB | W: | H:

chrome/app/theme/ash/toolbar_shade_top.png
chrome/app/theme/ash/toolbar_shade_top.png
chrome/app/theme/ash/toolbar_shade_top.png
chrome/app/theme/ash/toolbar_shade_top.png
  • 2-up
  • Swipe
  • Onion skin
chrome/app/theme/theme_resources_2x.grd
View file @ 797961dd
......@@ -203,10 +203,18 @@
<include name="IDR_TAB_ALPHA_LEFT" file="tab_alpha_left_2x.png" type="BINDATA" />
<include name="IDR_TAB_ALPHA_RIGHT" file="tab_alpha_right_2x.png" type="BINDATA" />
</if>
<if expr="pp_ifdef('use_ash')">
<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" />
</if>
<if expr="not pp_ifdef('use_ash')">
<include name="IDR_TAB_CLOSE" file="tab_close_2x.png" type="BINDATA" />
<include name="IDR_TAB_CLOSE_H" file="tab_close_h_2x.png" type="BINDATA" />
<include name="IDR_TAB_CLOSE_MASK" file="tab_close_mask_2x.png" type="BINDATA" />
<include name="IDR_TAB_CLOSE_P" file="tab_close_p_2x.png" type="BINDATA" />
</if>
<include name="IDR_TAB_DROP_DOWN" file="tab_drop_down_2x.png" type="BINDATA" />
<include name="IDR_TAB_DROP_UP" file="tab_drop_up_2x.png" type="BINDATA" />
<if expr="pp_ifdef('use_ash')">
......@@ -220,10 +228,10 @@
<include name="IDR_TAB_INACTIVE_RIGHT" file="tab_inactive_right_2x.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" />
<include name="IDR_THEME_FRAME_INCOGNITO" file="ash/theme_frame_incognito.png" type="BINDATA" />
<include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="ash/theme_frame_incognito_inactive.png" type="BINDATA" />
<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" />
</if>
<if expr="not pp_ifdef('use_ash')">
<include name="IDR_THEME_FRAME" file="theme_frame.png" type="BINDATA" />
......
chrome/app/theme/theme_resources_metro_1x.grd
View file @ 797961dd
......@@ -203,10 +203,18 @@
<include name="IDR_TAB_ALPHA_LEFT" file="metro/tab_alpha_left_metro_1_0x.png" type="BINDATA" />
<include name="IDR_TAB_ALPHA_RIGHT" file="metro/tab_alpha_right_metro_1_0x.png" type="BINDATA" />
</if>
<if expr="pp_ifdef('use_ash')">
<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" />
</if>
<if expr="not pp_ifdef('use_ash')">
<include name="IDR_TAB_CLOSE" file="metro/tab_close_metro_1_0x.png" type="BINDATA" />
<include name="IDR_TAB_CLOSE_H" file="metro/tab_close_h_metro_1_0x.png" type="BINDATA" />
<include name="IDR_TAB_CLOSE_MASK" file="metro/tab_close_mask_metro_1_0x.png" type="BINDATA" />
<include name="IDR_TAB_CLOSE_P" file="metro/tab_close_p_metro_1_0x.png" type="BINDATA" />
</if>
<include name="IDR_TAB_DROP_DOWN" file="metro/tab_drop_down_metro_1_0x.png" type="BINDATA" />
<include name="IDR_TAB_DROP_UP" file="metro/tab_drop_up_metro_1_0x.png" type="BINDATA" />
<if expr="pp_ifdef('use_ash')">
......@@ -220,10 +228,10 @@
<include name="IDR_TAB_INACTIVE_RIGHT" file="metro/tab_inactive_right_metro_1_0x.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" />
<include name="IDR_THEME_FRAME_INCOGNITO" file="ash/theme_frame_incognito.png" type="BINDATA" />
<include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="ash/theme_frame_incognito_inactive.png" type="BINDATA" />
<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" />
</if>
<if expr="not pp_ifdef('use_ash')">
<include name="IDR_THEME_FRAME" file="theme_frame.png" type="BINDATA" />
......
chrome/app/theme/theme_resources_standard.grd
View file @ 797961dd
......@@ -206,10 +206,21 @@
<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>
<!-- Note: Tab close buttons are not traditional buttons. Tab close buttons
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('use_ash')">
<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" />
</if>
<if expr="not pp_ifdef('use_ash')">
<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" />
</if>
<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('use_ash')">
......@@ -223,10 +234,10 @@
<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" />
<include name="IDR_THEME_FRAME_INCOGNITO" file="ash/theme_frame_incognito.png" type="BINDATA" />
<include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="ash/theme_frame_incognito_inactive.png" type="BINDATA" />
<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" />
</if>
<if expr="not pp_ifdef('use_ash')">
<include name="IDR_THEME_FRAME" file="theme_frame.png" type="BINDATA" />
......
ui/resources/aura/textbutton_hot_bottom.png
View replaced file @ fa202f3e View file @ 797961dd
ui/resources/aura/textbutton_hot_bottom.png

1007 Bytes | W: | H:

ui/resources/aura/textbutton_hot_bottom.png

1.03 KB | W: | H:

ui/resources/aura/textbutton_hot_bottom.png
ui/resources/aura/textbutton_hot_bottom.png
ui/resources/aura/textbutton_hot_bottom.png
ui/resources/aura/textbutton_hot_bottom.png
  • 2-up
  • Swipe
  • Onion skin
ui/resources/aura/textbutton_hot_center.png
View replaced file @ fa202f3e View file @ 797961dd
ui/resources/aura/textbutton_hot_center.png

1011 Bytes | W: | H:

ui/resources/aura/textbutton_hot_center.png

1.03 KB | W: | H:

ui/resources/aura/textbutton_hot_center.png
ui/resources/aura/textbutton_hot_center.png
ui/resources/aura/textbutton_hot_center.png
ui/resources/aura/textbutton_hot_center.png
  • 2-up
  • Swipe
  • Onion skin
ui/resources/aura/textbutton_hot_top.png
View replaced file @ fa202f3e View file @ 797961dd
ui/resources/aura/textbutton_hot_top.png

1003 Bytes | W: | H:

ui/resources/aura/textbutton_hot_top.png

1.02 KB | W: | H:

ui/resources/aura/textbutton_hot_top.png
ui/resources/aura/textbutton_hot_top.png
ui/resources/aura/textbutton_hot_top.png
ui/resources/aura/textbutton_hot_top.png
  • 2-up
  • Swipe
  • Onion skin
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment