diff options
| -rw-r--r-- | chrome/app/theme/theme_resources.grd | 1 | ||||
| -rw-r--r-- | chrome/app/theme/theme_resources_2x.grd | 70 | ||||
| -rw-r--r-- | chrome/app/theme/theme_resources_metro_1x.grd | 176 | ||||
| -rw-r--r-- | chrome/app/theme/theme_resources_standard.grd | 67 | ||||
| -rw-r--r-- | chrome/browser/ui/tabs/tab_resources.cc | 36 | ||||
| -rw-r--r-- | chrome/browser/ui/views/frame/glass_browser_frame_view.cc | 13 | ||||
| -rw-r--r-- | chrome/browser/ui/views/frame/opaque_browser_frame_view.cc | 10 | ||||
| -rw-r--r-- | chrome/browser/ui/views/location_bar/location_bar_view.cc | 30 | ||||
| -rw-r--r-- | chrome/browser/ui/views/tabs/tab.cc | 35 | ||||
| -rw-r--r-- | chrome/browser/ui/views/tabs/tab_strip.cc | 11 | ||||
| -rw-r--r-- | chrome/browser/ui/views/tabs/tab_strip.h | 4 | ||||
| -rw-r--r-- | chrome/browser/ui/views/toolbar_view.cc | 32 |
12 files changed, 220 insertions, 265 deletions
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd index a091b4a..c9d372b 100644 --- a/chrome/app/theme/theme_resources.grd +++ b/chrome/app/theme/theme_resources.grd @@ -323,6 +323,7 @@ <include name="IDR_THEME_FRAME_OVERLAY_INACTIVE" file="notused.png" type="BINDATA" /> <include name="IDR_THEME_NTP_ATTRIBUTION" file="notused.png" type="BINDATA" /> <include name="IDR_THEME_NTP_BACKGROUND" file="ntp_background.png" type="BINDATA" /> + <!-- Ash has a special gray background. --> <if expr="pp_ifdef('use_ash')"> <include name="IDR_THEME_TAB_BACKGROUND_INCOGNITO" file="ash/theme_tab_background_incognito.png" type="BINDATA" /> </if> diff --git a/chrome/app/theme/theme_resources_2x.grd b/chrome/app/theme/theme_resources_2x.grd index 49bd18d..6212229 100644 --- a/chrome/app/theme/theme_resources_2x.grd +++ b/chrome/app/theme/theme_resources_2x.grd @@ -17,13 +17,13 @@ <include name="IDR_APP_NOTIFICATION_SMALL_BUBBLE" file="small_bubble.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')"> + <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" /> </if> - <if expr="not pp_ifdef('use_ash')"> + <if expr="not pp_ifdef('toolkit_views')"> <include name="IDR_BACK" file="back_2x.png" type="BINDATA" /> <include name="IDR_BACK_D" file="back_d_2x.png" type="BINDATA" /> <include name="IDR_BACK_H" file="back_h_2x.png" type="BINDATA" /> @@ -38,34 +38,30 @@ <include name="IDR_BLOCKED_PLUGINS" file="blocked_plugins_2x.png" type="BINDATA" /> <include name="IDR_BLOCKED_POPUPS" file="blocked_popups_2x.png" type="BINDATA" /> <include name="IDR_BOOKMARKS_FAVICON" file="bookmarks_favicon_2x.png" type="BINDATA" /> - <if expr="pp_ifdef('use_ash')"> + <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" /> </if> - <if expr="not pp_ifdef('use_ash')"> + <if expr="not pp_ifdef('toolkit_views')"> <include name="IDR_BROWSER_ACTION" file="browser_action_2x.png" type="BINDATA" /> <include name="IDR_BROWSER_ACTION_H" file="browser_action_h_2x.png" type="BINDATA" /> <include name="IDR_BROWSER_ACTION_P" file="browser_action_p_2x.png" type="BINDATA" /> </if> - <if expr="pp_ifdef('use_ash')"> + <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" /> </if> - <if expr="not is_win and not pp_ifdef('use_ash')"> + <if expr="not pp_ifdef('toolkit_views')"> <include name="IDR_BROWSER_ACTIONS_OVERFLOW" file="browser_actions_overflow_2x.png" type="BINDATA" /> <include name="IDR_BROWSER_ACTIONS_OVERFLOW_H" file="browser_actions_overflow_h_2x.png" type="BINDATA" /> <include name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="browser_actions_overflow_p_2x.png" type="BINDATA" /> </if> - <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" /> - </if> <if expr="is_win"> <include name="IDR_CONFLICT_FAVICON" file="about_conflicts_favicon_2x.png" type="BINDATA" /> </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" /> </if> @@ -81,13 +77,13 @@ <include name="IDR_FEEDBACK_H" file="feedback_h_2x.png" type="BINDATA" /> <include name="IDR_FEEDBACK_P" file="feedback_p_2x.png" type="BINDATA" /> <include name="IDR_FLAGS" file="flags_2x.png" type="BINDATA" /> - <if expr="pp_ifdef('use_ash')"> + <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" /> </if> - <if expr="not pp_ifdef('use_ash')"> + <if expr="not pp_ifdef('toolkit_views')"> <include name="IDR_FORWARD" file="forward_2x.png" type="BINDATA" /> <include name="IDR_FORWARD_D" file="forward_d_2x.png" type="BINDATA" /> <include name="IDR_FORWARD_H" file="forward_h_2x.png" type="BINDATA" /> @@ -95,12 +91,12 @@ </if> <include name="IDR_GEOLOCATION_INFOBAR_ICON" file="infobar_geolocation_2x.png" type="BINDATA" /> <include name="IDR_HISTORY_FAVICON" file="history_favicon_2x.png" type="BINDATA" /> - <if expr="pp_ifdef('use_ash')"> + <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" /> </if> - <if expr="not pp_ifdef('use_ash')"> + <if expr="not pp_ifdef('toolkit_views')"> <include name="IDR_HOME" file="home_2x.png" type="BINDATA" /> <include name="IDR_HOME_H" file="home_h_2x.png" type="BINDATA" /> <include name="IDR_HOME_P" file="home_p_2x.png" type="BINDATA" /> @@ -124,13 +120,13 @@ <include name="IDR_INFOBAR_THEME" file="infobar_theme_2x.png" type="BINDATA" /> <include name="IDR_INFOBAR_TRANSLATE" file="infobar_translate_2x.png" type="BINDATA" /> <include name="IDR_KEYWORD_SEARCH_MAGNIFIER" file="keyword_search_magnifier_2x.png" type="BINDATA" /> - <if expr="pp_ifdef('use_ash')"> + <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" /> </if> - <if expr="not pp_ifdef('use_ash')"> + <if expr="not pp_ifdef('toolkit_views')"> <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" /> @@ -141,19 +137,13 @@ <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_R" file="keyword_search_bubble_r_2x.png" type="BINDATA" /> <include name="IDR_MOBILE" file="mobile_2x.png" type="BINDATA" /> <include name="IDR_MOBILE_LIT" file="mobile_lit_2x.png" type="BINDATA" /> - <if expr="pp_ifdef('use_ash')"> + <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" /> </if> - <if expr="not pp_ifdef('use_ash') and pp_ifdef('toolkit_views')"> - <include name="IDR_NEWTAB_BUTTON" file="newtab_views_2x.png" type="BINDATA" /> - <!-- No hot state. --> - <include name="IDR_NEWTAB_BUTTON_P" file="newtab_p_views_2x.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_MASK" file="newtab_button_mask_2x.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('use_ash') and not pp_ifdef('toolkit_views')"> + <if expr="not pp_ifdef('toolkit_views')"> <include name="IDR_NEWTAB_BUTTON" file="newtab_2x.png" type="BINDATA" /> <include name="IDR_NEWTAB_BUTTON_H" file="newtab_h_2x.png" type="BINDATA" /> <include name="IDR_NEWTAB_BUTTON_P" file="newtab_p_2x.png" type="BINDATA" /> @@ -164,12 +154,12 @@ <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_L" file="ev_bubble_l_2x.png" type="BINDATA" /> <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_R" file="ev_bubble_r_2x.png" type="BINDATA" /> <include name="IDR_PLUGIN" file="plugin_2x.png" type="BINDATA" /> - <if expr="pp_ifdef('use_ash')"> + <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" /> </if> - <if expr="not pp_ifdef('use_ash')"> + <if expr="not pp_ifdef('toolkit_views')"> <include name="IDR_RELOAD" file="reload_2x.png" type="BINDATA" /> <include name="IDR_RELOAD_H" file="reload_h_2x.png" type="BINDATA" /> <include name="IDR_RELOAD_P" file="reload_p_2x.png" type="BINDATA" /> @@ -177,39 +167,42 @@ <include name="IDR_SAD_FAVICON" file="sadfavicon_2x.png" type="BINDATA" /> <include name="IDR_STAR" file="star_2x.png" type="BINDATA" /> <include name="IDR_STAR_LIT" file="star_lit_2x.png" type="BINDATA" /> - <if expr="pp_ifdef('use_ash')"> + <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" /> </if> - <if expr="not pp_ifdef('use_ash')"> + <if expr="not pp_ifdef('toolkit_views')"> <include name="IDR_STOP" file="stop_2x.png" type="BINDATA" /> <include name="IDR_STOP_D" file="stop_d_2x.png" type="BINDATA" /> <include name="IDR_STOP_H" file="stop_h_2x.png" type="BINDATA" /> <include name="IDR_STOP_P" file="stop_p_2x.png" type="BINDATA" /> </if> - <if expr="pp_ifdef('use_ash')"> + <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" /> </if> - <if expr="not pp_ifdef('use_ash')"> + <if expr="not pp_ifdef('toolkit_views')"> <include name="IDR_TAB_ACTIVE_CENTER" file="tab_active_center_2x.png" type="BINDATA" /> <include name="IDR_TAB_ACTIVE_LEFT" file="tab_active_left_2x.png" type="BINDATA" /> <include name="IDR_TAB_ACTIVE_RIGHT" file="tab_active_right_2x.png" type="BINDATA" /> <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')"> + <!-- 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('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" /> </if> - <if expr="not pp_ifdef('use_ash')"> + <if expr="not pp_ifdef('toolkit_views')"> <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" /> @@ -217,16 +210,17 @@ </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')"> + <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" /> </if> - <if expr="not pp_ifdef('use_ash')"> + <if expr="not pp_ifdef('toolkit_views')"> <include name="IDR_TAB_INACTIVE_CENTER" file="tab_inactive_center_2x.png" type="BINDATA" /> <include name="IDR_TAB_INACTIVE_LEFT" file="tab_inactive_left_2x.png" type="BINDATA" /> <include name="IDR_TAB_INACTIVE_RIGHT" file="tab_inactive_right_2x.png" type="BINDATA" /> </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" /> @@ -239,12 +233,14 @@ <include name="IDR_THEME_FRAME_INCOGNITO" file="theme_frame_incognito.png" type="BINDATA" /> <include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="theme_frame_incognito_inactive.png" type="BINDATA" /> </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" /> </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" /> </if> @@ -258,12 +254,12 @@ <include name="IDR_THEME_TOOLBAR_INACTIVE" file="theme_toolbar_default_inactive2_2x.png" type="BINDATA" /> </if> <include name="IDR_THROBBER_WAITING" file="throbber_waiting_2x.png" type="BINDATA" /> - <if expr="pp_ifdef('use_ash')"> + <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" /> </if> - <if expr="not pp_ifdef('use_ash')"> + <if expr="not pp_ifdef('toolkit_views')"> <include name="IDR_TOOLS" file="tools_2x.png" type="BINDATA" /> <include name="IDR_TOOLS_H" file="tools_h_2x.png" type="BINDATA" /> <include name="IDR_TOOLS_P" file="tools_p_2x.png" type="BINDATA" /> diff --git a/chrome/app/theme/theme_resources_metro_1x.grd b/chrome/app/theme/theme_resources_metro_1x.grd index 3c238c7..f3b1fc8 100644 --- a/chrome/app/theme/theme_resources_metro_1x.grd +++ b/chrome/app/theme/theme_resources_metro_1x.grd @@ -17,18 +17,18 @@ <include name="IDR_APP_NOTIFICATION_SMALL_BUBBLE" file="small_bubble.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')"> + <if expr="pp_ifdef('toolkit_views')"> <include name="IDR_BACK" file="metro/back_metro_1_0x.png" type="BINDATA" /> <include name="IDR_BACK_D" file="metro/back_d_metro_1_0x.png" type="BINDATA" /> <include name="IDR_BACK_H" file="metro/back_h_metro_1_0x.png" type="BINDATA" /> <include name="IDR_BACK_P" file="metro/back_p_metro_1_0x.png" type="BINDATA" /> </if> + <if expr="not pp_ifdef('toolkit_views')"> + <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="metro/notification_wrench_metro_1_0x.png" type="BINDATA" /> <include name="IDR_BALLOON_WRENCH_H" file="metro/notification_wrench_h_metro_1_0x.png" type="BINDATA" /> <include name="IDR_BALLOON_WRENCH_P" file="metro/notification_wrench_p_metro_1_0x.png" type="BINDATA" /> @@ -38,34 +38,30 @@ <include name="IDR_BLOCKED_PLUGINS" file="metro/blocked_plugins_metro_1_0x.png" type="BINDATA" /> <include name="IDR_BLOCKED_POPUPS" file="metro/blocked_popups_metro_1_0x.png" type="BINDATA" /> <include name="IDR_BOOKMARKS_FAVICON" file="metro/bookmarks_favicon_metro_1_0x.png" type="BINDATA" /> - <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')"> + <if expr="pp_ifdef('toolkit_views')"> <include name="IDR_BROWSER_ACTION" file="metro/browser_action_metro_1_0x.png" type="BINDATA" /> <include name="IDR_BROWSER_ACTION_H" file="metro/browser_action_h_metro_1_0x.png" type="BINDATA" /> <include name="IDR_BROWSER_ACTION_P" file="metro/browser_action_p_metro_1_0x.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 expr="not pp_ifdef('toolkit_views')"> + <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="not is_win and not pp_ifdef('use_ash')"> + <if expr="pp_ifdef('toolkit_views')"> <include name="IDR_BROWSER_ACTIONS_OVERFLOW" file="metro/browser_actions_overflow_metro_1_0x.png" type="BINDATA" /> <include name="IDR_BROWSER_ACTIONS_OVERFLOW_H" file="metro/browser_actions_overflow_h_metro_1_0x.png" type="BINDATA" /> <include name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="metro/browser_actions_overflow_p_metro_1_0x.png" type="BINDATA" /> </if> - <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" /> + <if expr="not pp_ifdef('toolkit_views')"> + <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"> <include name="IDR_CONFLICT_FAVICON" file="metro/about_conflicts_favicon_metro_1_0x.png" type="BINDATA" /> </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" /> </if> @@ -81,30 +77,30 @@ <include name="IDR_FEEDBACK_H" file="metro/feedback_h_metro_1_0x.png" type="BINDATA" /> <include name="IDR_FEEDBACK_P" file="metro/feedback_p_metro_1_0x.png" type="BINDATA" /> <include name="IDR_FLAGS" file="metro/flags_metro_1_0x.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')"> + <if expr="pp_ifdef('toolkit_views')"> <include name="IDR_FORWARD" file="metro/forward_metro_1_0x.png" type="BINDATA" /> <include name="IDR_FORWARD_D" file="metro/forward_d_metro_1_0x.png" type="BINDATA" /> <include name="IDR_FORWARD_H" file="metro/forward_h_metro_1_0x.png" type="BINDATA" /> <include name="IDR_FORWARD_P" file="metro/forward_p_metro_1_0x.png" type="BINDATA" /> </if> + <if expr="not pp_ifdef('toolkit_views')"> + <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="metro/infobar_geolocation_metro_1_0x.png" type="BINDATA" /> <include name="IDR_HISTORY_FAVICON" file="metro/history_favicon_metro_1_0x.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')"> + <if expr="pp_ifdef('toolkit_views')"> <include name="IDR_HOME" file="metro/home_metro_1_0x.png" type="BINDATA" /> <include name="IDR_HOME_H" file="metro/home_h_metro_1_0x.png" type="BINDATA" /> <include name="IDR_HOME_P" file="metro/home_p_metro_1_0x.png" type="BINDATA" /> </if> + <if expr="not pp_ifdef('toolkit_views')"> + <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="metro/infobar_didyoumean_metro_1_0x.png" type="BINDATA" /> <include name="IDR_INFOBAR_AUTOFILL" file="metro/infobar_autofill_metro_1_0x.png" type="BINDATA" /> <include name="IDR_INFOBAR_AUTOLOGIN" file="metro/infobar_autologin_metro_1_0x.png" type="BINDATA" /> @@ -124,13 +120,13 @@ <include name="IDR_INFOBAR_THEME" file="metro/infobar_theme_metro_1_0x.png" type="BINDATA" /> <include name="IDR_INFOBAR_TRANSLATE" file="metro/infobar_translate_metro_1_0x.png" type="BINDATA" /> <include name="IDR_KEYWORD_SEARCH_MAGNIFIER" file="metro/keyword_search_magnifier_metro_1_0x.png" type="BINDATA" /> - <if expr="pp_ifdef('use_ash')"> + <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" /> </if> - <if expr="not pp_ifdef('use_ash')"> + <if expr="not pp_ifdef('toolkit_views')"> <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" /> @@ -141,92 +137,90 @@ <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_R" file="metro/keyword_search_bubble_r_metro_1_0x.png" type="BINDATA" /> <include name="IDR_MOBILE" file="metro/mobile_metro_1_0x.png" type="BINDATA" /> <include name="IDR_MOBILE_LIT" file="metro/mobile_lit_metro_1_0x.png" type="BINDATA" /> - <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="metro/newtab_views_metro_1_0x.png" type="BINDATA" /> - <!-- No hot state. --> - <include name="IDR_NEWTAB_BUTTON_P" file="metro/newtab_p_views_metro_1_0x.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_MASK" file="metro/newtab_button_mask_metro_1_0x.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('use_ash') and not pp_ifdef('toolkit_views')"> + <if expr="pp_ifdef('toolkit_views')"> <include name="IDR_NEWTAB_BUTTON" file="metro/newtab_metro_1_0x.png" type="BINDATA" /> <include name="IDR_NEWTAB_BUTTON_H" file="metro/newtab_h_metro_1_0x.png" type="BINDATA" /> <include name="IDR_NEWTAB_BUTTON_P" file="metro/newtab_p_metro_1_0x.png" type="BINDATA" /> <include name="IDR_NEWTAB_BUTTON_MASK" file="metro/newtab_button_mask_metro_1_0x.png" type="BINDATA" /> </if> + <if expr="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_SETTINGS_FAVICON" file="metro/settings_favicon_metro_1_0x.png" type="BINDATA" /> <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_C" file="metro/ev_bubble_c_metro_1_0x.png" type="BINDATA" /> <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_L" file="metro/ev_bubble_l_metro_1_0x.png" type="BINDATA" /> <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_R" file="metro/ev_bubble_r_metro_1_0x.png" type="BINDATA" /> <include name="IDR_PLUGIN" file="metro/plugin_metro_1_0x.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')"> + <if expr="pp_ifdef('toolkit_views')"> <include name="IDR_RELOAD" file="metro/reload_metro_1_0x.png" type="BINDATA" /> <include name="IDR_RELOAD_H" file="metro/reload_h_metro_1_0x.png" type="BINDATA" /> <include name="IDR_RELOAD_P" file="metro/reload_p_metro_1_0x.png" type="BINDATA" /> </if> + <if expr="not pp_ifdef('toolkit_views')"> + <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="metro/sadfavicon_metro_1_0x.png" type="BINDATA" /> <include name="IDR_STAR" file="metro/star_metro_1_0x.png" type="BINDATA" /> <include name="IDR_STAR_LIT" file="metro/star_lit_metro_1_0x.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')"> + <if expr="pp_ifdef('toolkit_views')"> <include name="IDR_STOP" file="metro/stop_metro_1_0x.png" type="BINDATA" /> <include name="IDR_STOP_D" file="metro/stop_d_metro_1_0x.png" type="BINDATA" /> <include name="IDR_STOP_H" file="metro/stop_h_metro_1_0x.png" type="BINDATA" /> <include name="IDR_STOP_P" file="metro/stop_p_metro_1_0x.png" type="BINDATA" /> </if> - <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 expr="not pp_ifdef('toolkit_views')"> + <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> - <if expr="not pp_ifdef('use_ash')"> + <if expr="pp_ifdef('toolkit_views')"> <include name="IDR_TAB_ACTIVE_CENTER" file="metro/tab_active_center_metro_1_0x.png" type="BINDATA" /> <include name="IDR_TAB_ACTIVE_LEFT" file="metro/tab_active_left_metro_1_0x.png" type="BINDATA" /> <include name="IDR_TAB_ACTIVE_RIGHT" file="metro/tab_active_right_metro_1_0x.png" type="BINDATA" /> <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')"> + <if expr="not pp_ifdef('toolkit_views')"> + <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> + <!-- 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('toolkit_views')"> <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> + <if expr="not pp_ifdef('toolkit_views')"> + <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="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')"> - <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')"> + <if expr="pp_ifdef('toolkit_views')"> <include name="IDR_TAB_INACTIVE_CENTER" file="metro/tab_inactive_center_metro_1_0x.png" type="BINDATA" /> <include name="IDR_TAB_INACTIVE_LEFT" file="metro/tab_inactive_left_metro_1_0x.png" type="BINDATA" /> <include name="IDR_TAB_INACTIVE_RIGHT" file="metro/tab_inactive_right_metro_1_0x.png" type="BINDATA" /> </if> + <if expr="not pp_ifdef('toolkit_views')"> + <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> + <!-- 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" /> @@ -239,35 +233,39 @@ <include name="IDR_THEME_FRAME_INCOGNITO" file="theme_frame_incognito.png" type="BINDATA" /> <include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="theme_frame_incognito_inactive.png" type="BINDATA" /> </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" /> </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" /> </if> <if expr="not pp_ifdef('use_ash') and is_macosx"> + <!-- TODO(jamescook): Is this right? --> <include name="IDR_THEME_TOOLBAR" file="metro/theme_toolbar_default2_metro_1_0x.png" type="BINDATA" /> </if> <if expr="not pp_ifdef('use_ash') and not is_macosx"> <include name="IDR_THEME_TOOLBAR" file="theme_toolbar_default.png" type="BINDATA" /> </if> <if expr="is_macosx"> + <!-- TODO(jamescook): Is this right? --> <include name="IDR_THEME_TOOLBAR_INACTIVE" file="metro/theme_toolbar_default_inactive2_metro_1_0x.png" type="BINDATA" /> </if> <include name="IDR_THROBBER_WAITING" file="metro/throbber_waiting_metro_1_0x.png" type="BINDATA" /> - <if expr="pp_ifdef('use_ash')"> - <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" /> - </if> - <if expr="not pp_ifdef('use_ash')"> + <if expr="pp_ifdef('toolkit_views')"> <include name="IDR_TOOLS" file="metro/tools_metro_1_0x.png" type="BINDATA" /> <include name="IDR_TOOLS_H" file="metro/tools_h_metro_1_0x.png" type="BINDATA" /> <include name="IDR_TOOLS_P" file="metro/tools_p_metro_1_0x.png" type="BINDATA" /> </if> + <if expr="not pp_ifdef('toolkit_views')"> + <include name="IDR_TOOLS" file="tools.png" type="BINDATA" /> + <include name="IDR_TOOLS_H" file="tools_h.png" type="BINDATA" /> + <include name="IDR_TOOLS_P" file="tools_p.png" type="BINDATA" /> + </if> </includes> </release> </grit> diff --git a/chrome/app/theme/theme_resources_standard.grd b/chrome/app/theme/theme_resources_standard.grd index 1b84aee..8e831c4 100644 --- a/chrome/app/theme/theme_resources_standard.grd +++ b/chrome/app/theme/theme_resources_standard.grd @@ -20,13 +20,13 @@ <include name="IDR_APP_NOTIFICATION_SMALL_BUBBLE" file="small_bubble.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')"> + <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" /> </if> - <if expr="not pp_ifdef('use_ash')"> + <if expr="not pp_ifdef('toolkit_views')"> <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" /> @@ -41,34 +41,30 @@ <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" /> - <if expr="pp_ifdef('use_ash')"> + <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" /> </if> - <if expr="not pp_ifdef('use_ash')"> + <if expr="not pp_ifdef('toolkit_views')"> <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')"> + <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" /> </if> - <if expr="not is_win and not pp_ifdef('use_ash')"> + <if expr="not pp_ifdef('toolkit_views')"> <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 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" /> - </if> <if expr="is_win"> <include name="IDR_CONFLICT_FAVICON" file="about_conflicts_favicon.png" type="BINDATA" /> </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" /> </if> @@ -84,13 +80,13 @@ <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" /> - <if expr="pp_ifdef('use_ash')"> + <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" /> </if> - <if expr="not pp_ifdef('use_ash')"> + <if expr="not pp_ifdef('toolkit_views')"> <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" /> @@ -98,12 +94,12 @@ </if> <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('use_ash')"> + <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" /> </if> - <if expr="not pp_ifdef('use_ash')"> + <if expr="not pp_ifdef('toolkit_views')"> <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" /> @@ -127,13 +123,13 @@ <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" /> - <if expr="pp_ifdef('use_ash')"> + <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" /> </if> - <if expr="not pp_ifdef('use_ash')"> + <if expr="not pp_ifdef('toolkit_views')"> <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" /> @@ -144,19 +140,13 @@ <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('use_ash')"> + <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" /> </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('use_ash') and not pp_ifdef('toolkit_views')"> + <if expr="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" /> @@ -167,12 +157,12 @@ <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" /> - <if expr="pp_ifdef('use_ash')"> + <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" /> </if> - <if expr="not pp_ifdef('use_ash')"> + <if expr="not pp_ifdef('toolkit_views')"> <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" /> @@ -180,26 +170,26 @@ <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" /> - <if expr="pp_ifdef('use_ash')"> + <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" /> </if> - <if expr="not pp_ifdef('use_ash')"> + <if expr="not pp_ifdef('toolkit_views')"> <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> - <if expr="pp_ifdef('use_ash')"> + <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" /> </if> - <if expr="not pp_ifdef('use_ash')"> + <if expr="not pp_ifdef('toolkit_views')"> <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" /> @@ -209,13 +199,13 @@ <!-- 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')"> + <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" /> </if> - <if expr="not pp_ifdef('use_ash')"> + <if expr="not pp_ifdef('toolkit_views')"> <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" /> @@ -223,16 +213,17 @@ </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')"> + <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" /> </if> - <if expr="not pp_ifdef('use_ash')"> + <if expr="not pp_ifdef('toolkit_views')"> <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> + <!-- 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" /> @@ -245,12 +236,14 @@ <include name="IDR_THEME_FRAME_INCOGNITO" file="theme_frame_incognito.png" type="BINDATA" /> <include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="theme_frame_incognito_inactive.png" type="BINDATA" /> </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" /> </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" /> </if> @@ -264,12 +257,12 @@ <include name="IDR_THEME_TOOLBAR_INACTIVE" file="theme_toolbar_default_inactive2.png" type="BINDATA" /> </if> <include name="IDR_THROBBER_WAITING" file="throbber_waiting.png" type="BINDATA" /> - <if expr="pp_ifdef('use_ash')"> + <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" /> </if> - <if expr="not pp_ifdef('use_ash')"> + <if expr="not pp_ifdef('toolkit_views')"> <include name="IDR_TOOLS" file="tools.png" type="BINDATA" /> <include name="IDR_TOOLS_H" file="tools_h.png" type="BINDATA" /> <include name="IDR_TOOLS_P" file="tools_p.png" type="BINDATA" /> diff --git a/chrome/browser/ui/tabs/tab_resources.cc b/chrome/browser/ui/tabs/tab_resources.cc index aad9e1e..8a7902f 100644 --- a/chrome/browser/ui/tabs/tab_resources.cc +++ b/chrome/browser/ui/tabs/tab_resources.cc @@ -13,11 +13,14 @@ namespace { const SkScalar kTabCapWidth = 15; const SkScalar kTabTopCurveWidth = 4; const SkScalar kTabBottomCurveWidth = 3; -#if defined(USE_ASH) -// Ash has shadows in the left and right part of the tab. +#if defined(TOOLKIT_VIEWS) +// Windows and Ash have shadows in the left, right and top parts of the tab. const SkScalar kTabInset = 6; +const SkScalar kTabTop = 2; #else +// Linux GTK and Mac don't have the shadows. const SkScalar kTabInset = 0; +const SkScalar kTabTop = 0; #endif } // namespace @@ -26,27 +29,30 @@ const SkScalar kTabInset = 0; void TabResources::GetHitTestMask(int width, int height, gfx::Path* path) { DCHECK(path); - SkScalar h = SkIntToScalar(height); - SkScalar w = SkIntToScalar(width); - SkScalar left = kTabInset; - path->moveTo(left, h); + SkScalar top = kTabTop; + SkScalar right = SkIntToScalar(width) - kTabInset; + SkScalar bottom = SkIntToScalar(height); + + // Start in the lower-left corner. + path->moveTo(left, bottom); // Left end cap. - path->lineTo(left + kTabBottomCurveWidth, h - kTabBottomCurveWidth); - path->lineTo(left + kTabCapWidth - kTabTopCurveWidth, kTabTopCurveWidth); - path->lineTo(left + kTabCapWidth, 0); + path->lineTo(left + kTabBottomCurveWidth, bottom - kTabBottomCurveWidth); + path->lineTo(left + kTabCapWidth - kTabTopCurveWidth, + top + kTabTopCurveWidth); + path->lineTo(left + kTabCapWidth, top); // Connect to the right cap. - SkScalar right = w - kTabInset; - path->lineTo(right - kTabCapWidth, 0); + path->lineTo(right - kTabCapWidth, top); // Right end cap. - path->lineTo(right - kTabCapWidth + kTabTopCurveWidth, kTabTopCurveWidth); - path->lineTo(right - kTabBottomCurveWidth, h - kTabBottomCurveWidth); - path->lineTo(right, h); + path->lineTo(right - kTabCapWidth + kTabTopCurveWidth, + top + kTabTopCurveWidth); + path->lineTo(right - kTabBottomCurveWidth, bottom - kTabBottomCurveWidth); + path->lineTo(right, bottom); // Close out the path. - path->lineTo(left, h); + path->lineTo(left, bottom); path->close(); } diff --git a/chrome/browser/ui/views/frame/glass_browser_frame_view.cc b/chrome/browser/ui/views/frame/glass_browser_frame_view.cc index d396a5f..180a6b6 100644 --- a/chrome/browser/ui/views/frame/glass_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/glass_browser_frame_view.cc @@ -36,9 +36,9 @@ HICON GlassBrowserFrameView::throbber_icons_[ namespace { // There are 3 px of client edge drawn inside the outer frame borders. const int kNonClientBorderThickness = 3; -// Besides the frame border, there's another 11 px of empty space atop the +// Besides the frame border, there's another 9 px of empty space atop the // window in restored mode, to use to drag the window around. -const int kNonClientRestoredExtraThickness = 11; +const int kNonClientRestoredExtraThickness = 9; // In the window corners, the resize areas don't actually expand bigger, but the // 16 px at the end of the top and bottom edges triggers diagonal resizing. const int kResizeAreaCornerSize = 16; @@ -51,9 +51,9 @@ const int kAvatarBottomSpacing = 2; const int kAvatarSideSpacing = 2; // The content left/right images have a shadow built into them. const int kContentEdgeShadowThickness = 2; -// The top 1 px of the tabstrip is shadow; in maximized mode we push this off +// The top 3 px of the tabstrip is shadow; in maximized mode we push this off // the top of the screen so the tabs appear flush against the screen edge. -const int kTabstripTopShadowThickness = 1; +const int kTabstripTopShadowThickness = 3; // In restored mode, the New Tab button isn't at the same height as the caption // buttons, but the space will look cluttered if it actually slides under them, // so we stop it when the gap between the two is down to 5 px. @@ -62,6 +62,9 @@ const int kNewTabCaptionRestoredSpacing = 5; // similar vertical coordinates, we need to reserve a larger, 16 px gap to avoid // looking too cluttered. const int kNewTabCaptionMaximizedSpacing = 16; +// How far to indent the tabstrip from the left side of the screen when there +// is no avatar icon. +const int kTabStripIndent = -4; } /////////////////////////////////////////////////////////////////////////////// @@ -94,7 +97,7 @@ gfx::Rect GlassBrowserFrameView::GetBoundsForTabStrip( std::min(frame()->GetMinimizeButtonOffset(), width()); int tabstrip_x = browser_view()->ShouldShowAvatar() ? (avatar_bounds_.right() + kAvatarSideSpacing) : - NonClientBorderThickness(); + NonClientBorderThickness() + kTabStripIndent; // In RTL languages, we have moved an avatar icon left by the size of window // controls to prevent it from being rendered over them. So, we use its x // position to move this tab strip left when maximized. Also, we can render diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc index dacb1a8..b98c7f3 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc @@ -53,9 +53,9 @@ namespace { // The frame border is only visible in restored mode and is hardcoded to 4 px on // each side regardless of the system window border size. const int kFrameBorderThickness = 4; -// Besides the frame border, there's another 11 px of empty space atop the +// Besides the frame border, there's another 9 px of empty space atop the // window in restored mode, to use to drag the window around. -const int kNonClientRestoredExtraThickness = 11; +const int kNonClientRestoredExtraThickness = 9; // While resize areas on Windows are normally the same size as the window // borders, our top area is shrunk by 1 px to make it easier to move the window // around with our thinner top grabbable strip. (Incidentally, our side and @@ -87,9 +87,9 @@ const int kAvatarBottomSpacing = 2; // There are 2 px on each side of the avatar (between the frame border and // it on the left, and between it and the tabstrip on the right). const int kAvatarSideSpacing = 2; -// The top 1 px of the tabstrip is shadow; in maximized mode we push this off +// The top 3 px of the tabstrip is shadow; in maximized mode we push this off // the top of the screen so the tabs appear flush against the screen edge. -const int kTabstripTopShadowThickness = 1; +const int kTabstripTopShadowThickness = 3; // In restored mode, the New Tab button isn't at the same height as the caption // buttons, but the space will look cluttered if it actually slides under them, // so we stop it when the gap between the two is down to 5 px. @@ -100,7 +100,7 @@ const int kNewTabCaptionRestoredSpacing = 5; const int kNewTabCaptionMaximizedSpacing = 16; // How far to indent the tabstrip from the left side of the screen when there // is no avatar icon. -const int kTabStripIndent = 1; +const int kTabStripIndent = -4; // Converts |bounds| from |src|'s coordinate system to |dst|, and checks if // |pt| is contained within. diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc index c9d0cca..6303632 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc @@ -83,36 +83,17 @@ OmniboxViewViews* AsViews(OmniboxView* view) { } // Height of the location bar's round corner region. -// TODO(jamescook): Update all Chrome platforms to use the new art and metrics -// from Ash, crbug.com/118228 -#if defined(USE_ASH) const int kBorderRoundCornerHeight = 5; -#else -const int kBorderRoundCornerHeight = 6; -#endif - // Width of location bar's round corner region. -#if defined(USE_ASH) const int kBorderRoundCornerWidth = 4; -#else -const int kBorderRoundCornerWidth = 5; -#endif - // Radius of the round corners inside the location bar. -#if defined(USE_ASH) const int kBorderCornerRadius = 2; -#endif } // namespace // static -#if defined(USE_ASH) const int LocationBarView::kNormalHorizontalEdgeThickness = 2; const int LocationBarView::kVerticalEdgeThickness = 3; -#else -const int LocationBarView::kNormalHorizontalEdgeThickness = 1; -const int LocationBarView::kVerticalEdgeThickness = 2; -#endif // defined(USE_ASH) const int LocationBarView::kItemPadding = 3; const int LocationBarView::kIconInternalPadding = 2; const int LocationBarView::kEdgeItemPadding = kItemPadding; @@ -778,15 +759,9 @@ void LocationBarView::OnPaint(gfx::Canvas* canvas) { paint.setColor(color); paint.setStyle(SkPaint::kFill_Style); paint.setAntiAlias(true); -#if defined(USE_ASH) - // On Ash the omnibox uses smaller corners. + // TODO(jamescook): Make the corners of the dropdown match the corners of + // the omnibox. const SkScalar radius(SkIntToScalar(kBorderCornerRadius)); -#else - // The round corners of the omnibox match the round corners of the dropdown - // below, and all our other bubbles. - const SkScalar radius(SkIntToScalar( - views::BubbleBorder::GetCornerRadius())); -#endif bounds.Inset(kNormalHorizontalEdgeThickness, 0); canvas->sk_canvas()->drawRoundRect(gfx::RectToSkRect(bounds), radius, radius, paint); @@ -796,6 +771,7 @@ void LocationBarView::OnPaint(gfx::Canvas* canvas) { if (show_focus_rect_ && HasFocus()) { gfx::Rect r = location_entry_view_->bounds(); + // TODO(jamescook): Is this still needed? #if defined(OS_WIN) r.Inset(-1, -1); #else diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc index 202e36d..3675cdb 100644 --- a/chrome/browser/ui/views/tabs/tab.cc +++ b/chrome/browser/ui/views/tabs/tab.cc @@ -39,13 +39,14 @@ const int GetLeftPadding() { if (value == -1) { switch (ui::GetDisplayLayout()) { case ui::LAYOUT_ASH: - value = 21; + case ui::LAYOUT_DESKTOP: + value = 22; break; case ui::LAYOUT_TOUCH: value = 20; break; default: - value = 16; + NOTREACHED(); } } return value; @@ -56,13 +57,14 @@ const int GetTopPadding() { if (value == -1) { switch (ui::GetDisplayLayout()) { case ui::LAYOUT_ASH: + case ui::LAYOUT_DESKTOP: value = 8; break; case ui::LAYOUT_TOUCH: value = 12; break; default: - value = 6; + NOTREACHED(); } } return value; @@ -73,13 +75,12 @@ const int GetRightPadding() { if (value == -1) { switch (ui::GetDisplayLayout()) { case ui::LAYOUT_ASH: - value = 20; - break; + case ui::LAYOUT_DESKTOP: case ui::LAYOUT_TOUCH: value = 21; break; default: - value = 15; + NOTREACHED(); } } return value; @@ -89,46 +90,44 @@ const int GetBottomPadding() { static int value = -1; if (value == -1) { switch (ui::GetDisplayLayout()) { + case ui::LAYOUT_ASH: + case ui::LAYOUT_DESKTOP: + value = 5; + break; case ui::LAYOUT_TOUCH: value = 7; break; - case ui::LAYOUT_ASH: default: - value = 5; + NOTREACHED(); } } return value; } // Height of the shadow at the top of the tab image assets. -#if defined(USE_ASH) static const int kDropShadowHeight = 4; -#else -static const int kDropShadowHeight = 2; -#endif static const int kToolbarOverlap = 1; static const int kFaviconTitleSpacing = 4; -// Additional vertical offset for title text relative to top of tab. #if defined(USE_ASH) +// Additional vertical offset for title text relative to top of tab. +// Ash text rendering may be different than Windows. +// TODO(jamescook): Make this Chrome OS or Linux only? static const int kTitleTextOffsetY = 1; #else static const int kTitleTextOffsetY = 0; #endif static const int kTitleCloseButtonSpacing = 3; static const int kStandardTitleWidth = 175; -// Additional vertical offset for close button relative to top of tab. #if defined(USE_ASH) +// Additional vertical offset for close button relative to top of tab. +// Ash needs this to match the text vertical position. static const int kCloseButtonVertFuzz = 1; #else static const int kCloseButtonVertFuzz = 0; #endif static const int kTabIconSize = gfx::kFaviconSize; // Additional horizontal offset for close button relative to title text. -#if defined(USE_ASH) static const int kCloseButtonHorzFuzz = 7; -#else -static const int kCloseButtonHorzFuzz = 5; -#endif // When a non-mini-tab becomes a mini-tab the width of the tab animates. If // the width of a mini-tab is >= kMiniTabRendererAsNormalTabWidth then the tab diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc index 449fe44..a740327 100644 --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc @@ -91,13 +91,14 @@ const int GetNewTabButtonHOffset() { if (value == -1) { switch (ui::GetDisplayLayout()) { case ui::LAYOUT_ASH: + case ui::LAYOUT_DESKTOP: value = -11; break; case ui::LAYOUT_TOUCH: value = -6; break; default: - value = -5; + NOTREACHED(); } } return value; @@ -110,13 +111,14 @@ const int GetNewTabButtonVOffset() { if (value == -1) { switch (ui::GetDisplayLayout()) { case ui::LAYOUT_ASH: + case ui::LAYOUT_DESKTOP: value = 7; break; case ui::LAYOUT_TOUCH: value = 10; break; default: - value = 5; + NOTREACHED(); } } return value; @@ -129,13 +131,14 @@ const int GetTabHOffset() { if (value == -1) { switch (ui::GetDisplayLayout()) { case ui::LAYOUT_ASH: - value = -27; + case ui::LAYOUT_DESKTOP: + value = -29; break; case ui::LAYOUT_TOUCH: value = -16; break; default: - value = -16; + NOTREACHED(); } } return value; diff --git a/chrome/browser/ui/views/tabs/tab_strip.h b/chrome/browser/ui/views/tabs/tab_strip.h index 27e8168..c38a385 100644 --- a/chrome/browser/ui/views/tabs/tab_strip.h +++ b/chrome/browser/ui/views/tabs/tab_strip.h @@ -469,11 +469,7 @@ class TabStrip : public AbstractTabStripView, // able to lay it out before we are able to get its image from the // ui::ThemeProvider. It also makes sense to do this, because the size of the // new tab button should not need to be calculated dynamically. -#if defined(USE_ASH) static const int kNewTabButtonWidth = 34; -#else - static const int kNewTabButtonWidth = 28; -#endif static const int kNewTabButtonHeight = 18; // Valid for the lifetime of a drag over us. diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar_view.cc index 819e964..309950e 100644 --- a/chrome/browser/ui/views/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar_view.cc @@ -55,40 +55,24 @@ using content::WebContents; // static const char ToolbarView::kViewClassName[] = "browser/ui/views/ToolbarView"; -// The space between items is 4 px in general. -// TODO(jamescook): Update all Chrome platforms to use the new art and metrics -// from Ash, crbug.com/118228 -#if defined(USE_ASH) +// The space between items is 3 px in general. const int ToolbarView::kStandardSpacing = 3; -#else -const int ToolbarView::kStandardSpacing = 4; -#endif - -// The top of the toolbar has an edge we have to skip over in addition to the 4 -// px of spacing. -const int ToolbarView::kVertSpacing = 5; +// The top of the toolbar has an edge we have to skip over in addition to the +// above spacing. +const int ToolbarView::kVertSpacing = 4; // The edge graphics have some built-in spacing/shadowing, so we have to adjust -// our spacing to make it still appear to be 4 px. -#if defined(USE_ASH) +// our spacing to make it match. static const int kLeftEdgeSpacing = 3; static const int kRightEdgeSpacing = 2; -#else -static const int kLeftEdgeSpacing = 3; -static const int kRightEdgeSpacing = 3; -#endif // The buttons to the left of the omnibox are close together. -#if defined(USE_ASH) static const int kButtonSpacing = 0; -#else -static const int kButtonSpacing = 1; -#endif -// The content area line has a shadow that extends a couple of pixels above -// the toolbar bounds. #if defined(USE_ASH) +// Ash doesn't use a rounded content area and its top edge has an extra shadow. const int kContentShadowHeight = 2; #else +// Windows uses a rounded content area with no shadow in the assets. const int kContentShadowHeight = 0; #endif @@ -591,7 +575,7 @@ void ToolbarView::Layout() { int available_width = width() - kRightEdgeSpacing - app_menu_width - browser_actions_width - location_x; int location_y = child_y; - int location_bar_height = child_height; + int location_bar_height = location_bar_->GetPreferredSize().height(); location_bar_->SetBounds(location_x, location_y, std::max(available_width, 0), location_bar_height); |