diff options
84 files changed, 51 insertions, 24 deletions
diff --git a/chrome/app/theme/ash/browser_action_hot.png b/chrome/app/theme/ash/browser_action_hot.png Binary files differindex feaafba..94efa2b 100644 --- a/chrome/app/theme/ash/browser_action_hot.png +++ b/chrome/app/theme/ash/browser_action_hot.png diff --git a/chrome/app/theme/ash/browser_action_normal.png b/chrome/app/theme/ash/browser_action_normal.png Binary files differindex b61e11a..781af0b 100644 --- a/chrome/app/theme/ash/browser_action_normal.png +++ b/chrome/app/theme/ash/browser_action_normal.png diff --git a/chrome/app/theme/ash/browser_action_pressed.png b/chrome/app/theme/ash/browser_action_pressed.png Binary files differindex d3f3f03..1afcf30 100644 --- a/chrome/app/theme/ash/browser_action_pressed.png +++ b/chrome/app/theme/ash/browser_action_pressed.png diff --git a/chrome/app/theme/ash/browser_actions_overflow_hot.png b/chrome/app/theme/ash/browser_actions_overflow_hot.png Binary files differindex f1ca8ce..7806984 100644 --- a/chrome/app/theme/ash/browser_actions_overflow_hot.png +++ b/chrome/app/theme/ash/browser_actions_overflow_hot.png diff --git a/chrome/app/theme/ash/browser_actions_overflow_normal.png b/chrome/app/theme/ash/browser_actions_overflow_normal.png Binary files differindex 350b352..b596646 100644 --- a/chrome/app/theme/ash/browser_actions_overflow_normal.png +++ b/chrome/app/theme/ash/browser_actions_overflow_normal.png diff --git a/chrome/app/theme/ash/browser_actions_overflow_pressed.png b/chrome/app/theme/ash/browser_actions_overflow_pressed.png Binary files differindex 444a3fb..580bf29 100644 --- a/chrome/app/theme/ash/browser_actions_overflow_pressed.png +++ b/chrome/app/theme/ash/browser_actions_overflow_pressed.png diff --git a/chrome/app/theme/ash/browser_back_disabled.png b/chrome/app/theme/ash/browser_back_disabled.png Binary files differindex e767884..0a6dd8e 100644 --- a/chrome/app/theme/ash/browser_back_disabled.png +++ b/chrome/app/theme/ash/browser_back_disabled.png diff --git a/chrome/app/theme/ash/browser_back_hot.png b/chrome/app/theme/ash/browser_back_hot.png Binary files differindex 60c98dc..f0ce6f6 100644 --- a/chrome/app/theme/ash/browser_back_hot.png +++ b/chrome/app/theme/ash/browser_back_hot.png diff --git a/chrome/app/theme/ash/browser_back_normal.png b/chrome/app/theme/ash/browser_back_normal.png Binary files differindex 4a0f7a5..0a8768e 100644 --- a/chrome/app/theme/ash/browser_back_normal.png +++ b/chrome/app/theme/ash/browser_back_normal.png diff --git a/chrome/app/theme/ash/browser_back_pressed.png b/chrome/app/theme/ash/browser_back_pressed.png Binary files differindex 31723b8..ab55638 100644 --- a/chrome/app/theme/ash/browser_back_pressed.png +++ b/chrome/app/theme/ash/browser_back_pressed.png diff --git a/chrome/app/theme/ash/browser_forward_disabled.png b/chrome/app/theme/ash/browser_forward_disabled.png Binary files differindex 6cca3b1..e95ca76 100644 --- a/chrome/app/theme/ash/browser_forward_disabled.png +++ b/chrome/app/theme/ash/browser_forward_disabled.png diff --git a/chrome/app/theme/ash/browser_forward_hot.png b/chrome/app/theme/ash/browser_forward_hot.png Binary files differindex ebdbdbc..61c22ab 100644 --- a/chrome/app/theme/ash/browser_forward_hot.png +++ b/chrome/app/theme/ash/browser_forward_hot.png diff --git a/chrome/app/theme/ash/browser_forward_normal.png b/chrome/app/theme/ash/browser_forward_normal.png Binary files differindex 0fc54d9..13aa9b3 100644 --- a/chrome/app/theme/ash/browser_forward_normal.png +++ b/chrome/app/theme/ash/browser_forward_normal.png diff --git a/chrome/app/theme/ash/browser_forward_pressed.png b/chrome/app/theme/ash/browser_forward_pressed.png Binary files differindex 22e0be02..e70a5a3 100644 --- a/chrome/app/theme/ash/browser_forward_pressed.png +++ b/chrome/app/theme/ash/browser_forward_pressed.png diff --git a/chrome/app/theme/ash/browser_home_hot.png b/chrome/app/theme/ash/browser_home_hot.png Binary files differindex 8c04826..5d73b3d4 100644 --- a/chrome/app/theme/ash/browser_home_hot.png +++ b/chrome/app/theme/ash/browser_home_hot.png diff --git a/chrome/app/theme/ash/browser_home_normal.png b/chrome/app/theme/ash/browser_home_normal.png Binary files differindex c7014d9..cbfdbb5 100644 --- a/chrome/app/theme/ash/browser_home_normal.png +++ b/chrome/app/theme/ash/browser_home_normal.png diff --git a/chrome/app/theme/ash/browser_home_pressed.png b/chrome/app/theme/ash/browser_home_pressed.png Binary files differindex 8047cb3..15d4c67 100644 --- a/chrome/app/theme/ash/browser_home_pressed.png +++ b/chrome/app/theme/ash/browser_home_pressed.png diff --git a/chrome/app/theme/ash/browser_omnibox_border.png b/chrome/app/theme/ash/browser_omnibox_border.png Binary files differindex 465f321..3e8e06b 100644 --- a/chrome/app/theme/ash/browser_omnibox_border.png +++ b/chrome/app/theme/ash/browser_omnibox_border.png diff --git a/chrome/app/theme/ash/browser_omnibox_left.png b/chrome/app/theme/ash/browser_omnibox_left.png Binary files differindex acadacf..cc8c14e 100644 --- a/chrome/app/theme/ash/browser_omnibox_left.png +++ b/chrome/app/theme/ash/browser_omnibox_left.png diff --git a/chrome/app/theme/ash/browser_omnibox_middle.png b/chrome/app/theme/ash/browser_omnibox_middle.png Binary files differindex 4e04b25..185b923 100644 --- a/chrome/app/theme/ash/browser_omnibox_middle.png +++ b/chrome/app/theme/ash/browser_omnibox_middle.png diff --git a/chrome/app/theme/ash/browser_omnibox_right.png b/chrome/app/theme/ash/browser_omnibox_right.png Binary files differindex 00b7f9b..82f2848 100644 --- a/chrome/app/theme/ash/browser_omnibox_right.png +++ b/chrome/app/theme/ash/browser_omnibox_right.png diff --git a/chrome/app/theme/ash/browser_reload_disabled.png b/chrome/app/theme/ash/browser_reload_disabled.png Binary files differindex 62d78e6..d2cd49d 100644 --- a/chrome/app/theme/ash/browser_reload_disabled.png +++ b/chrome/app/theme/ash/browser_reload_disabled.png diff --git a/chrome/app/theme/ash/browser_reload_hot.png b/chrome/app/theme/ash/browser_reload_hot.png Binary files differindex 2fd361d..b0ff9bb 100644 --- a/chrome/app/theme/ash/browser_reload_hot.png +++ b/chrome/app/theme/ash/browser_reload_hot.png diff --git a/chrome/app/theme/ash/browser_reload_normal.png b/chrome/app/theme/ash/browser_reload_normal.png Binary files differindex 221102c..6775a41 100644 --- a/chrome/app/theme/ash/browser_reload_normal.png +++ b/chrome/app/theme/ash/browser_reload_normal.png diff --git a/chrome/app/theme/ash/browser_reload_pressed.png b/chrome/app/theme/ash/browser_reload_pressed.png Binary files differindex 100a413..7f3d118 100644 --- a/chrome/app/theme/ash/browser_reload_pressed.png +++ b/chrome/app/theme/ash/browser_reload_pressed.png diff --git a/chrome/app/theme/ash/browser_stop_disabled.png b/chrome/app/theme/ash/browser_stop_disabled.png Binary files differindex 20217ca..edabe2e 100644 --- a/chrome/app/theme/ash/browser_stop_disabled.png +++ b/chrome/app/theme/ash/browser_stop_disabled.png diff --git a/chrome/app/theme/ash/browser_stop_hot.png b/chrome/app/theme/ash/browser_stop_hot.png Binary files differindex ee48924..4565a08 100644 --- a/chrome/app/theme/ash/browser_stop_hot.png +++ b/chrome/app/theme/ash/browser_stop_hot.png diff --git a/chrome/app/theme/ash/browser_stop_normal.png b/chrome/app/theme/ash/browser_stop_normal.png Binary files differindex b05b1fc..7349724 100644 --- a/chrome/app/theme/ash/browser_stop_normal.png +++ b/chrome/app/theme/ash/browser_stop_normal.png diff --git a/chrome/app/theme/ash/browser_stop_pressed.png b/chrome/app/theme/ash/browser_stop_pressed.png Binary files differindex f9defb9..9c10120 100644 --- a/chrome/app/theme/ash/browser_stop_pressed.png +++ b/chrome/app/theme/ash/browser_stop_pressed.png diff --git a/chrome/app/theme/ash/browser_tools_hot.png b/chrome/app/theme/ash/browser_tools_hot.png Binary files differindex 76953ad..b769b1b 100644 --- a/chrome/app/theme/ash/browser_tools_hot.png +++ b/chrome/app/theme/ash/browser_tools_hot.png diff --git a/chrome/app/theme/ash/browser_tools_normal.png b/chrome/app/theme/ash/browser_tools_normal.png Binary files differindex 52df91b6..0432eca 100644 --- a/chrome/app/theme/ash/browser_tools_normal.png +++ b/chrome/app/theme/ash/browser_tools_normal.png diff --git a/chrome/app/theme/ash/browser_tools_pressed.png b/chrome/app/theme/ash/browser_tools_pressed.png Binary files differindex 29aeec4..3cfbc0e 100644 --- a/chrome/app/theme/ash/browser_tools_pressed.png +++ b/chrome/app/theme/ash/browser_tools_pressed.png diff --git a/chrome/app/theme/ash/newtab_button_mask.png b/chrome/app/theme/ash/newtab_button_mask.png Binary files differindex 44a6a07..5be901d 100644 --- a/chrome/app/theme/ash/newtab_button_mask.png +++ b/chrome/app/theme/ash/newtab_button_mask.png diff --git a/chrome/app/theme/ash/newtab_hot.png b/chrome/app/theme/ash/newtab_hot.png Binary files differindex 0a686ed..bcb6989 100644 --- a/chrome/app/theme/ash/newtab_hot.png +++ b/chrome/app/theme/ash/newtab_hot.png diff --git a/chrome/app/theme/ash/newtab_normal.png b/chrome/app/theme/ash/newtab_normal.png Binary files differindex dc92629..b8a7ad0 100644 --- a/chrome/app/theme/ash/newtab_normal.png +++ b/chrome/app/theme/ash/newtab_normal.png diff --git a/chrome/app/theme/ash/newtab_pressed.png b/chrome/app/theme/ash/newtab_pressed.png Binary files differindex c0e17fd..ee0bc3d 100644 --- a/chrome/app/theme/ash/newtab_pressed.png +++ b/chrome/app/theme/ash/newtab_pressed.png diff --git a/chrome/app/theme/ash/tab_active_center.png b/chrome/app/theme/ash/tab_active_center.png Binary files differindex ee117b6..a1ed692a 100644 --- a/chrome/app/theme/ash/tab_active_center.png +++ b/chrome/app/theme/ash/tab_active_center.png diff --git a/chrome/app/theme/ash/tab_active_left.png b/chrome/app/theme/ash/tab_active_left.png Binary files differindex 3ddf6c2..7449108 100644 --- a/chrome/app/theme/ash/tab_active_left.png +++ b/chrome/app/theme/ash/tab_active_left.png diff --git a/chrome/app/theme/ash/tab_active_right.png b/chrome/app/theme/ash/tab_active_right.png Binary files differindex f8a1ed1..9dfe2d6 100644 --- a/chrome/app/theme/ash/tab_active_right.png +++ b/chrome/app/theme/ash/tab_active_right.png diff --git a/chrome/app/theme/ash/tab_alpha_left.png b/chrome/app/theme/ash/tab_alpha_left.png Binary files differindex 53c0563..b785665 100644 --- a/chrome/app/theme/ash/tab_alpha_left.png +++ b/chrome/app/theme/ash/tab_alpha_left.png diff --git a/chrome/app/theme/ash/tab_alpha_right.png b/chrome/app/theme/ash/tab_alpha_right.png Binary files differindex 93542ee..a818788 100644 --- a/chrome/app/theme/ash/tab_alpha_right.png +++ b/chrome/app/theme/ash/tab_alpha_right.png diff --git a/chrome/app/theme/ash/tab_close_hot.png b/chrome/app/theme/ash/tab_close_hot.png Binary files differnew file mode 100644 index 0000000..cd90a86 --- /dev/null +++ b/chrome/app/theme/ash/tab_close_hot.png diff --git a/chrome/app/theme/ash/tab_close_mask.png b/chrome/app/theme/ash/tab_close_mask.png Binary files differnew file mode 100644 index 0000000..aeb1944 --- /dev/null +++ b/chrome/app/theme/ash/tab_close_mask.png diff --git a/chrome/app/theme/ash/tab_close_normal.png b/chrome/app/theme/ash/tab_close_normal.png Binary files differnew file mode 100644 index 0000000..b434067 --- /dev/null +++ b/chrome/app/theme/ash/tab_close_normal.png diff --git a/chrome/app/theme/ash/tab_close_pressed.png b/chrome/app/theme/ash/tab_close_pressed.png Binary files differnew file mode 100644 index 0000000..11ef4e3b --- /dev/null +++ b/chrome/app/theme/ash/tab_close_pressed.png diff --git a/chrome/app/theme/ash/tab_inactive_center.png b/chrome/app/theme/ash/tab_inactive_center.png Binary files differindex e5e16da..fe912cd 100644 --- a/chrome/app/theme/ash/tab_inactive_center.png +++ b/chrome/app/theme/ash/tab_inactive_center.png diff --git a/chrome/app/theme/ash/tab_inactive_left.png b/chrome/app/theme/ash/tab_inactive_left.png Binary files differindex a547bcc..4db628d 100644 --- a/chrome/app/theme/ash/tab_inactive_left.png +++ b/chrome/app/theme/ash/tab_inactive_left.png diff --git a/chrome/app/theme/ash/tab_inactive_right.png b/chrome/app/theme/ash/tab_inactive_right.png Binary files differindex 73fdd46..1360f30 100644 --- a/chrome/app/theme/ash/tab_inactive_right.png +++ b/chrome/app/theme/ash/tab_inactive_right.png diff --git a/chrome/app/theme/ash/theme_default_active.png b/chrome/app/theme/ash/theme_default_active.png Binary files differnew file mode 100644 index 0000000..780ef68 --- /dev/null +++ b/chrome/app/theme/ash/theme_default_active.png diff --git a/chrome/app/theme/ash/theme_default_inactive.png b/chrome/app/theme/ash/theme_default_inactive.png Binary files differnew file mode 100644 index 0000000..aad6131 --- /dev/null +++ b/chrome/app/theme/ash/theme_default_inactive.png diff --git a/chrome/app/theme/ash/theme_frame.png b/chrome/app/theme/ash/theme_frame.png Binary files differdeleted file mode 100644 index 5bf4588..0000000 --- a/chrome/app/theme/ash/theme_frame.png +++ /dev/null diff --git a/chrome/app/theme/ash/theme_frame_inactive.png b/chrome/app/theme/ash/theme_frame_inactive.png Binary files differdeleted file mode 100644 index 1c46011..0000000 --- a/chrome/app/theme/ash/theme_frame_inactive.png +++ /dev/null diff --git a/chrome/app/theme/ash/theme_frame_incognito.png b/chrome/app/theme/ash/theme_frame_incognito.png Binary files differdeleted file mode 100644 index 6fb50ea..0000000 --- a/chrome/app/theme/ash/theme_frame_incognito.png +++ /dev/null diff --git a/chrome/app/theme/ash/theme_frame_incognito_inactive.png b/chrome/app/theme/ash/theme_frame_incognito_inactive.png Binary files differdeleted file mode 100644 index a4d322a..0000000 --- a/chrome/app/theme/ash/theme_frame_incognito_inactive.png +++ /dev/null diff --git a/chrome/app/theme/ash/theme_incognito_active.png b/chrome/app/theme/ash/theme_incognito_active.png Binary files differnew file mode 100644 index 0000000..eb1ff35 --- /dev/null +++ b/chrome/app/theme/ash/theme_incognito_active.png diff --git a/chrome/app/theme/ash/theme_incognito_inactive.png b/chrome/app/theme/ash/theme_incognito_inactive.png Binary files differnew file mode 100644 index 0000000..f3079a0 --- /dev/null +++ b/chrome/app/theme/ash/theme_incognito_inactive.png diff --git a/chrome/app/theme/ash/toolbar_shade_bottom.png b/chrome/app/theme/ash/toolbar_shade_bottom.png Binary files differindex 21860ac..c85712b 100644 --- a/chrome/app/theme/ash/toolbar_shade_bottom.png +++ b/chrome/app/theme/ash/toolbar_shade_bottom.png diff --git a/chrome/app/theme/ash/toolbar_shade_bottom_left.png b/chrome/app/theme/ash/toolbar_shade_bottom_left.png Binary files differindex cfe098e..fd9efba 100644 --- a/chrome/app/theme/ash/toolbar_shade_bottom_left.png +++ b/chrome/app/theme/ash/toolbar_shade_bottom_left.png diff --git a/chrome/app/theme/ash/toolbar_shade_bottom_right.png b/chrome/app/theme/ash/toolbar_shade_bottom_right.png Binary files differindex c87be55..04713c0 100644 --- a/chrome/app/theme/ash/toolbar_shade_bottom_right.png +++ b/chrome/app/theme/ash/toolbar_shade_bottom_right.png diff --git a/chrome/app/theme/ash/toolbar_shade_left.png b/chrome/app/theme/ash/toolbar_shade_left.png Binary files differindex 67c48d0..363c204 100644 --- a/chrome/app/theme/ash/toolbar_shade_left.png +++ b/chrome/app/theme/ash/toolbar_shade_left.png diff --git a/chrome/app/theme/ash/toolbar_shade_line.png b/chrome/app/theme/ash/toolbar_shade_line.png Binary files differnew file mode 100644 index 0000000..e2030b3 --- /dev/null +++ b/chrome/app/theme/ash/toolbar_shade_line.png diff --git a/chrome/app/theme/ash/toolbar_shade_right.png b/chrome/app/theme/ash/toolbar_shade_right.png Binary files differindex 9436dd3..14eb68f 100644 --- a/chrome/app/theme/ash/toolbar_shade_right.png +++ b/chrome/app/theme/ash/toolbar_shade_right.png diff --git a/chrome/app/theme/ash/toolbar_shade_top.png b/chrome/app/theme/ash/toolbar_shade_top.png Binary files differindex 6bfde393b..3e51e41 100644 --- a/chrome/app/theme/ash/toolbar_shade_top.png +++ b/chrome/app/theme/ash/toolbar_shade_top.png diff --git a/chrome/app/theme/theme_resources_2x.grd b/chrome/app/theme/theme_resources_2x.grd index d76c3c2d..49bd18d 100644 --- a/chrome/app/theme/theme_resources_2x.grd +++ b/chrome/app/theme/theme_resources_2x.grd @@ -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> - <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 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" /> diff --git a/chrome/app/theme/theme_resources_metro_1x.grd b/chrome/app/theme/theme_resources_metro_1x.grd index a7eed02..3c238c7 100644 --- a/chrome/app/theme/theme_resources_metro_1x.grd +++ b/chrome/app/theme/theme_resources_metro_1x.grd @@ -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> - <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 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" /> diff --git a/chrome/app/theme/theme_resources_standard.grd b/chrome/app/theme/theme_resources_standard.grd index 7da76e2..1b84aee 100644 --- a/chrome/app/theme/theme_resources_standard.grd +++ b/chrome/app/theme/theme_resources_standard.grd @@ -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> - <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" /> + <!-- 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" /> diff --git a/ui/resources/aura/textbutton_hot_bottom.png b/ui/resources/aura/textbutton_hot_bottom.png Binary files differindex aebb9e5..5784c32 100644 --- a/ui/resources/aura/textbutton_hot_bottom.png +++ b/ui/resources/aura/textbutton_hot_bottom.png diff --git a/ui/resources/aura/textbutton_hot_bottom_left.png b/ui/resources/aura/textbutton_hot_bottom_left.png Binary files differindex aab66f5..33373e1 100644 --- a/ui/resources/aura/textbutton_hot_bottom_left.png +++ b/ui/resources/aura/textbutton_hot_bottom_left.png diff --git a/ui/resources/aura/textbutton_hot_bottom_right.png b/ui/resources/aura/textbutton_hot_bottom_right.png Binary files differindex 57203f6..daa98d7 100644 --- a/ui/resources/aura/textbutton_hot_bottom_right.png +++ b/ui/resources/aura/textbutton_hot_bottom_right.png diff --git a/ui/resources/aura/textbutton_hot_center.png b/ui/resources/aura/textbutton_hot_center.png Binary files differindex 9f1ea02..9650443 100644 --- a/ui/resources/aura/textbutton_hot_center.png +++ b/ui/resources/aura/textbutton_hot_center.png diff --git a/ui/resources/aura/textbutton_hot_left.png b/ui/resources/aura/textbutton_hot_left.png Binary files differindex 7690e81e..52f9e8e 100644 --- a/ui/resources/aura/textbutton_hot_left.png +++ b/ui/resources/aura/textbutton_hot_left.png diff --git a/ui/resources/aura/textbutton_hot_right.png b/ui/resources/aura/textbutton_hot_right.png Binary files differindex a1a5881..fdd2dee 100644 --- a/ui/resources/aura/textbutton_hot_right.png +++ b/ui/resources/aura/textbutton_hot_right.png diff --git a/ui/resources/aura/textbutton_hot_top.png b/ui/resources/aura/textbutton_hot_top.png Binary files differindex 6a38d7d..8afebd6 100644 --- a/ui/resources/aura/textbutton_hot_top.png +++ b/ui/resources/aura/textbutton_hot_top.png diff --git a/ui/resources/aura/textbutton_hot_top_left.png b/ui/resources/aura/textbutton_hot_top_left.png Binary files differindex 6cee07f..f1361f2 100644 --- a/ui/resources/aura/textbutton_hot_top_left.png +++ b/ui/resources/aura/textbutton_hot_top_left.png diff --git a/ui/resources/aura/textbutton_hot_top_right.png b/ui/resources/aura/textbutton_hot_top_right.png Binary files differindex 55e275f..18ea375 100644 --- a/ui/resources/aura/textbutton_hot_top_right.png +++ b/ui/resources/aura/textbutton_hot_top_right.png diff --git a/ui/resources/aura/textbutton_pressed_bottom.png b/ui/resources/aura/textbutton_pressed_bottom.png Binary files differindex d490264..7ba9dea 100644 --- a/ui/resources/aura/textbutton_pressed_bottom.png +++ b/ui/resources/aura/textbutton_pressed_bottom.png diff --git a/ui/resources/aura/textbutton_pressed_bottom_left.png b/ui/resources/aura/textbutton_pressed_bottom_left.png Binary files differindex 9369986..4edbcbd 100644 --- a/ui/resources/aura/textbutton_pressed_bottom_left.png +++ b/ui/resources/aura/textbutton_pressed_bottom_left.png diff --git a/ui/resources/aura/textbutton_pressed_bottom_right.png b/ui/resources/aura/textbutton_pressed_bottom_right.png Binary files differindex f915e23..3681113 100644 --- a/ui/resources/aura/textbutton_pressed_bottom_right.png +++ b/ui/resources/aura/textbutton_pressed_bottom_right.png diff --git a/ui/resources/aura/textbutton_pressed_center.png b/ui/resources/aura/textbutton_pressed_center.png Binary files differindex 5e43d02..93513bb 100644 --- a/ui/resources/aura/textbutton_pressed_center.png +++ b/ui/resources/aura/textbutton_pressed_center.png diff --git a/ui/resources/aura/textbutton_pressed_left.png b/ui/resources/aura/textbutton_pressed_left.png Binary files differindex b7bba78..6ce6d78 100644 --- a/ui/resources/aura/textbutton_pressed_left.png +++ b/ui/resources/aura/textbutton_pressed_left.png diff --git a/ui/resources/aura/textbutton_pressed_right.png b/ui/resources/aura/textbutton_pressed_right.png Binary files differindex 6220a0c..e9da198 100644 --- a/ui/resources/aura/textbutton_pressed_right.png +++ b/ui/resources/aura/textbutton_pressed_right.png diff --git a/ui/resources/aura/textbutton_pressed_top.png b/ui/resources/aura/textbutton_pressed_top.png Binary files differindex cf8c159..c35a35b 100644 --- a/ui/resources/aura/textbutton_pressed_top.png +++ b/ui/resources/aura/textbutton_pressed_top.png diff --git a/ui/resources/aura/textbutton_pressed_top_left.png b/ui/resources/aura/textbutton_pressed_top_left.png Binary files differindex a1527cc..ba0be42 100644 --- a/ui/resources/aura/textbutton_pressed_top_left.png +++ b/ui/resources/aura/textbutton_pressed_top_left.png diff --git a/ui/resources/aura/textbutton_pressed_top_right.png b/ui/resources/aura/textbutton_pressed_top_right.png Binary files differindex 4b5a2e8..17f7b0f 100644 --- a/ui/resources/aura/textbutton_pressed_top_right.png +++ b/ui/resources/aura/textbutton_pressed_top_right.png |
