diff options
| -rw-r--r-- | chrome/app/theme/README | 16 | ||||
| -rw-r--r-- | chrome/app/theme/theme_resources_2x.grd | 293 | ||||
| -rw-r--r-- | chrome/app/theme/theme_resources_standard.grd | 457 | ||||
| -rw-r--r-- | chrome/app/theme/theme_resources_touch_1x.grd | 295 | ||||
| -rw-r--r-- | chrome/app/theme/theme_resources_touch_2x.grd | 295 | ||||
| -rw-r--r-- | chrome/browser/ui/libgtk2ui/libgtk2ui.gyp | 1 | ||||
| -rw-r--r-- | chrome/chrome_browser.gypi | 1 | ||||
| -rw-r--r-- | chrome/chrome_browser_extensions.gypi | 1 | ||||
| -rw-r--r-- | chrome/chrome_dll.gypi | 2 | ||||
| -rw-r--r-- | chrome/chrome_resources.gyp | 30 | ||||
| -rw-r--r-- | tools/gritsettings/resource_ids | 24 | ||||
| -rw-r--r-- | ui/aura/aura.gyp | 1 | ||||
| -rw-r--r-- | ui/resources/ui_resources_2x.grd | 233 | ||||
| -rw-r--r-- | ui/resources/ui_resources_standard.grd | 446 | ||||
| -rw-r--r-- | ui/resources/ui_resources_touch.grd | 230 | ||||
| -rw-r--r-- | ui/resources/ui_resources_touch_2x.grd | 230 | ||||
| -rw-r--r-- | ui/ui_resources.gypi | 51 |
17 files changed, 495 insertions, 2111 deletions
diff --git a/chrome/app/theme/README b/chrome/app/theme/README index 7475eab..a6815c7 100644 --- a/chrome/app/theme/README +++ b/chrome/app/theme/README @@ -1,17 +1,3 @@ -When adding a new icon please follow these two steps: - -Step 1. Run pngcrush on all new icons. For example: +Please run pngcrush on all new icons. For example: mkdir crushed pngcrush -d crushed -brute -reduce new/*.png - -Step 2. While adding an icon to one of the following files: - theme_resources_standard.grd - theme_resources_2x.grd - theme_resources_touch_1x.grd - theme_resources_touch_2x.grd -make sure to add the same icon to all the other .grd files. -Verify that you did this correctly by doing a diff of the generated header -files. For example: - diff Debug/gen/chrome/grit/theme_resources_standard.h \ - Debug/gen/chrome/grit/theme_resources_2x.h -should be empty. diff --git a/chrome/app/theme/theme_resources_2x.grd b/chrome/app/theme/theme_resources_2x.grd deleted file mode 100644 index 960fe650..0000000 --- a/chrome/app/theme/theme_resources_2x.grd +++ /dev/null @@ -1,293 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<grit latest_public_release="0" current_release="1"> - <outputs> - <output filename="grit/theme_resources_2x.h" type="rc_header"> - <emit emit_type='prepend'></emit> - </output> - <output filename="theme_resources_2x.pak" type="data_package" /> - </outputs> - <release seq="1"> - <includes> - <!-- KEEP THESE IN ALPHABETICAL ORDER AND SYNCHRONIZED WITH - theme_resources_standard.grd. THIS MEANS THAT EACH ICON IN THIS FILE - MUST HAVE AN EQUIVALENT ICON IN THE OTHER FILE. - YOU MUST ALSO REPLICATE ALL IFDEFS. --> - <include name="IDR_APP_NOTIFICATION_NUB" file="default_100_percent/nub.png" type="BINDATA" /> - <include name="IDR_APP_NOTIFICATION_NUB_MASK" file="default_100_percent/nub_mask.png" type="BINDATA" /> - <include name="IDR_APP_NOTIFICATION_SMALL_BUBBLE" file="default_100_percent/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('toolkit_views')"> - <include name="IDR_BACK" file="default_100_percent/ash/browser_back_normal.png" type="BINDATA" /> - <include name="IDR_BACK_D" file="default_100_percent/ash/browser_back_disabled.png" type="BINDATA" /> - <include name="IDR_BACK_H" file="default_100_percent/ash/browser_back_hover.png" type="BINDATA" /> - <include name="IDR_BACK_P" file="default_100_percent/ash/browser_back_pressed.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_BACK" file="default_200_percent/back.png" type="BINDATA" /> - <include name="IDR_BACK_D" file="default_200_percent/back_disabled.png" type="BINDATA" /> - <include name="IDR_BACK_H" file="default_200_percent/back_hover.png" type="BINDATA" /> - <include name="IDR_BACK_P" file="default_200_percent/back_pressed.png" type="BINDATA" /> - </if> - <include name="IDR_BALLOON_WRENCH" file="default_200_percent/notification_wrench.png" type="BINDATA" /> - <include name="IDR_BALLOON_WRENCH_H" file="default_200_percent/notification_wrench_hover.png" type="BINDATA" /> - <include name="IDR_BALLOON_WRENCH_P" file="default_200_percent/notification_wrench_pressed.png" type="BINDATA" /> - <include name="IDR_BLOCKED_COOKIES" file="default_200_percent/blocked_cookies.png" type="BINDATA" /> - <include name="IDR_BLOCKED_IMAGES" file="default_200_percent/blocked_images.png" type="BINDATA" /> - <include name="IDR_BLOCKED_JAVASCRIPT" file="default_200_percent/blocked_script.png" type="BINDATA" /> - <include name="IDR_BLOCKED_PLUGINS" file="default_200_percent/blocked_plugins.png" type="BINDATA" /> - <include name="IDR_BLOCKED_POPUPS" file="default_200_percent/blocked_popups.png" type="BINDATA" /> - <include name="IDR_BOOKMARKS_FAVICON" file="default_200_percent/bookmarks_favicon.png" type="BINDATA" /> - <if expr="pp_ifdef('toolkit_views')"> - <include name="IDR_BROWSER_ACTION" file="default_100_percent/ash/browser_action_normal.png" type="BINDATA" /> - <include name="IDR_BROWSER_ACTION_H" file="default_100_percent/ash/browser_action_hover.png" type="BINDATA" /> - <include name="IDR_BROWSER_ACTION_P" file="default_100_percent/ash/browser_action_pressed.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_BROWSER_ACTION" file="default_200_percent/browser_action.png" type="BINDATA" /> - <include name="IDR_BROWSER_ACTION_H" file="default_200_percent/browser_action_hover.png" type="BINDATA" /> - <include name="IDR_BROWSER_ACTION_P" file="default_200_percent/browser_action_pressed.png" type="BINDATA" /> - </if> - <if expr="pp_ifdef('toolkit_views')"> - <include name="IDR_BROWSER_ACTIONS_OVERFLOW" file="default_100_percent/ash/browser_actions_overflow_normal.png" type="BINDATA" /> - <include name="IDR_BROWSER_ACTIONS_OVERFLOW_H" file="default_100_percent/ash/browser_actions_overflow_hover.png" type="BINDATA" /> - <include name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="default_100_percent/ash/browser_actions_overflow_pressed.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_BROWSER_ACTIONS_OVERFLOW" file="default_200_percent/browser_actions_overflow.png" type="BINDATA" /> - <include name="IDR_BROWSER_ACTIONS_OVERFLOW_H" file="default_200_percent/browser_actions_overflow_hover.png" type="BINDATA" /> - <include name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="default_200_percent/browser_actions_overflow_pressed.png" type="BINDATA" /> - </if> - <if expr="is_win"> - <include name="IDR_CONFLICT_FAVICON" file="default_200_percent/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="default_100_percent/ash/content_top_center.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('use_ash')"> - <include name="IDR_CONTENT_TOP_CENTER" file="default_100_percent/content_top_center.png" type="BINDATA" /> - </if> - <include name="IDR_CONTENT_TOP_LEFT_CORNER" file="default_100_percent/content_top_left_corner.png" type="BINDATA" /> - <include name="IDR_CONTENT_TOP_LEFT_CORNER_MASK" file="default_100_percent/content_top_left_corner_mask.png" type="BINDATA" /> - <include name="IDR_CONTENT_TOP_RIGHT_CORNER" file="default_100_percent/content_top_right_corner.png" type="BINDATA" /> - <include name="IDR_CONTENT_TOP_RIGHT_CORNER_MASK" file="default_100_percent/content_top_right_corner_mask.png" type="BINDATA" /> - <include name="IDR_DOWNLOADS_FAVICON" file="default_200_percent/downloads_favicon.png" type="BINDATA" /> - <include name="IDR_FEEDBACK" file="default_200_percent/feedback.png" type="BINDATA" /> - <include name="IDR_FEEDBACK_H" file="default_200_percent/feedback_hover.png" type="BINDATA" /> - <include name="IDR_FEEDBACK_P" file="default_200_percent/feedback_pressed.png" type="BINDATA" /> - <include name="IDR_FLAGS" file="default_200_percent/flags.png" type="BINDATA" /> - <if expr="pp_ifdef('toolkit_views')"> - <include name="IDR_FORWARD" file="default_100_percent/ash/browser_forward_normal.png" type="BINDATA" /> - <include name="IDR_FORWARD_D" file="default_100_percent/ash/browser_forward_disabled.png" type="BINDATA" /> - <include name="IDR_FORWARD_H" file="default_100_percent/ash/browser_forward_hover.png" type="BINDATA" /> - <include name="IDR_FORWARD_P" file="default_100_percent/ash/browser_forward_pressed.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_FORWARD" file="default_200_percent/forward.png" type="BINDATA" /> - <include name="IDR_FORWARD_D" file="default_200_percent/forward_disabled.png" type="BINDATA" /> - <include name="IDR_FORWARD_H" file="default_200_percent/forward_hover.png" type="BINDATA" /> - <include name="IDR_FORWARD_P" file="default_200_percent/forward_pressed.png" type="BINDATA" /> - </if> - <include name="IDR_GEOLOCATION_INFOBAR_ICON" file="default_200_percent/infobar_geolocation.png" type="BINDATA" /> - <include name="IDR_HISTORY_FAVICON" file="default_200_percent/history_favicon.png" type="BINDATA" /> - <if expr="pp_ifdef('toolkit_views')"> - <include name="IDR_HOME" file="default_100_percent/ash/browser_home_normal.png" type="BINDATA" /> - <include name="IDR_HOME_H" file="default_100_percent/ash/browser_home_hover.png" type="BINDATA" /> - <include name="IDR_HOME_P" file="default_100_percent/ash/browser_home_pressed.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_HOME" file="default_200_percent/home.png" type="BINDATA" /> - <include name="IDR_HOME_H" file="default_200_percent/home_hover.png" type="BINDATA" /> - <include name="IDR_HOME_P" file="default_200_percent/home_pressed.png" type="BINDATA" /> - </if> - <include name="IDR_INFOBAR_ALT_NAV_URL" file="default_200_percent/infobar_didyoumean.png" type="BINDATA" /> - <include name="IDR_INFOBAR_AUTOFILL" file="default_200_percent/infobar_autofill.png" type="BINDATA" /> - <include name="IDR_INFOBAR_AUTOLOGIN" file="default_200_percent/infobar_autologin.png" type="BINDATA" /> - <include name="IDR_INFOBAR_COOKIE" file="default_200_percent/infobar_cookie.png" type="BINDATA" /> - <include name="IDR_INFOBAR_DESKTOP_NOTIFICATIONS" file="default_200_percent/infobar_desktop_notifications.png" type="BINDATA" /> - <include name="IDR_INFOBAR_INCOMPLETE" file="default_200_percent/infobar_incomplete.png" type="BINDATA" /> - <include name="IDR_INFOBAR_MEDIA_STREAM_CAMERA" file="default_200_percent/infobar_camera.png" type="BINDATA" /> - <include name="IDR_INFOBAR_MEDIA_STREAM_MIC" file="default_200_percent/infobar_microphone.png" type="BINDATA" /> - <include name="IDR_INFOBAR_MULTIPLE_DOWNLOADS" file="default_200_percent/infobar_multiple_downloads.png" type="BINDATA" /> - <include name="IDR_INFOBAR_PLUGIN_CRASHED" file="default_200_percent/infobar_plugin_crashed.png" type="BINDATA" /> - <include name="IDR_INFOBAR_PLUGIN_INSTALL" file="default_200_percent/infobar_plugin.png" type="BINDATA" /> - <include name="IDR_INFOBAR_QUESTION_MARK" file="default_200_percent/infobar_questionmark.png" type="BINDATA" /> - <include name="IDR_INFOBAR_RESTORE_SESSION" file="default_200_percent/infobar_restore.png" type="BINDATA" /> - <include name="IDR_INFOBAR_SAVE_PASSWORD" file="default_200_percent/infobar_savepassword.png" type="BINDATA" /> - <include name="IDR_INFOBAR_SSL_WARNING" file="default_200_percent/infobar_insecure.png" type="BINDATA" /> - <include name="IDR_INFOBAR_SYNC" file="default_200_percent/infobar_sync.png" type="BINDATA" /> - <include name="IDR_INFOBAR_THEME" file="default_200_percent/infobar_theme.png" type="BINDATA" /> - <include name="IDR_INFOBAR_TRANSLATE" file="default_200_percent/infobar_translate.png" type="BINDATA" /> - <include name="IDR_KEYWORD_SEARCH_MAGNIFIER" file="default_200_percent/keyword_search_magnifier.png" type="BINDATA" /> - <if expr="pp_ifdef('toolkit_views')"> - <include name="IDR_LOCATIONBG_C" file="default_100_percent/ash/browser_omnibox_middle.png" type="BINDATA" /> - <include name="IDR_LOCATIONBG_L" file="default_100_percent/ash/browser_omnibox_left.png" type="BINDATA" /> - <include name="IDR_LOCATIONBG_R" file="default_100_percent/ash/browser_omnibox_right.png" type="BINDATA" /> - <include name="IDR_LOCATION_BAR_BORDER" file="default_100_percent/ash/browser_omnibox_border.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_LOCATIONBG_C" file="default_100_percent/omnibox_c.png" type="BINDATA" /> - <include name="IDR_LOCATIONBG_L" file="default_100_percent/omnibox_l.png" type="BINDATA" /> - <include name="IDR_LOCATIONBG_R" file="default_100_percent/omnibox_r.png" type="BINDATA" /> - <include name="IDR_LOCATION_BAR_BORDER" file="default_100_percent/omnibox_border.png" type="BINDATA" /> - </if> - <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_C" file="default_200_percent/keyword_search_bubble_c.png" type="BINDATA" /> - <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_L" file="default_200_percent/keyword_search_bubble_l.png" type="BINDATA" /> - <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_R" file="default_200_percent/keyword_search_bubble_r.png" type="BINDATA" /> - <include name="IDR_MOBILE" file="default_200_percent/mobile.png" type="BINDATA" /> - <include name="IDR_MOBILE_LIT" file="default_200_percent/mobile_lit.png" type="BINDATA" /> - <if expr="pp_ifdef('use_ash')"> - <include name="IDR_NEWTAB_BUTTON" file="default_100_percent/ash/newtab_normal.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_H" file="default_100_percent/ash/newtab_hover.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_P" file="default_100_percent/ash/newtab_pressed.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_MASK" file="default_100_percent/ash/newtab_button_mask.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_PLUS" file="default_100_percent/newtab_views_plus.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_P_PLUS" file="default_100_percent/newtab_p_views_plus.png" type="BINDATA" /> - </if> - <if expr="pp_ifdef('toolkit_views') and not pp_ifdef('use_ash')"> - <include name="IDR_NEWTAB_BUTTON" file="default_100_percent/newtab_views.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_H" file="default_100_percent/newtab_hover.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_P" file="default_100_percent/newtab_p_views.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_MASK" file="default_100_percent/newtab_button_mask_views.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_PLUS" file="default_100_percent/newtab_views_plus.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_P_PLUS" file="default_100_percent/newtab_p_views_plus.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('toolkit_views') and not pp_ifdef('use_ash')"> - <include name="IDR_NEWTAB_BUTTON" file="default_200_percent/newtab.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_H" file="default_200_percent/newtab_hover.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_P" file="default_200_percent/newtab_pressed.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_MASK" file="default_200_percent/newtab_button_mask.png" type="BINDATA" /> - </if> - <include name="IDR_SETTINGS_FAVICON" file="default_100_percent/settings_favicon.png" type="BINDATA" /> - <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_C" file="default_200_percent/ev_bubble_c.png" type="BINDATA" /> - <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_L" file="default_200_percent/ev_bubble_l.png" type="BINDATA" /> - <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_R" file="default_200_percent/ev_bubble_r.png" type="BINDATA" /> - <include name="IDR_OTR_ICON" file="default_100_percent/otr_icon.png" type="BINDATA" /> - <include name="IDR_OTR_ICON_FULLSCREEN" file="default_100_percent/otr_icon.png" type="BINDATA" /> - <include name="IDR_PLUGIN" file="default_200_percent/plugin.png" type="BINDATA" /> - <if expr="pp_ifdef('toolkit_views')"> - <include name="IDR_RELOAD" file="default_100_percent/ash/browser_reload_normal.png" type="BINDATA" /> - <include name="IDR_RELOAD_H" file="default_100_percent/ash/browser_reload_hover.png" type="BINDATA" /> - <include name="IDR_RELOAD_P" file="default_100_percent/ash/browser_reload_pressed.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_RELOAD" file="default_200_percent/reload.png" type="BINDATA" /> - <include name="IDR_RELOAD_H" file="default_200_percent/reload_hover.png" type="BINDATA" /> - <include name="IDR_RELOAD_P" file="default_200_percent/reload_pressed.png" type="BINDATA" /> - </if> - <include name="IDR_SAD_FAVICON" file="default_200_percent/sadfavicon.png" type="BINDATA" /> - <include name="IDR_STAR" file="default_200_percent/star.png" type="BINDATA" /> - <include name="IDR_STAR_LIT" file="default_200_percent/star_lit.png" type="BINDATA" /> - <if expr="pp_ifdef('chromeos')"> - <include name="IDR_STATUSBAR_NETWORK_ARCS_DARK" file="default_200_percent/statusbar_network_arcs_dark.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_NETWORK_ARCS_LIGHT" file="default_200_percent/statusbar_network_arcs_light.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_NETWORK_BARS_DARK" file="default_200_percent/statusbar_network_bars_dark.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_NETWORK_BARS_LIGHT" file="default_200_percent/statusbar_network_bars_light.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_NETWORK_SECURE" file="default_200_percent/statusbar_network_secure.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_VPN" file="default_200_percent/statusbar_vpn_dark.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_WIRED" file="default_200_percent/statusbar_wired.png" type="BINDATA" /> - </if> - <include name="IDR_ACTION_BOX_BUTTON" file="default_100_percent/action_box_button.png" type="BINDATA" /> - <if expr="pp_ifdef('toolkit_views')"> - <include name="IDR_STOP" file="default_100_percent/ash/browser_stop_normal.png" type="BINDATA" /> - <include name="IDR_STOP_D" file="default_100_percent/ash/browser_stop_disabled.png" type="BINDATA" /> - <include name="IDR_STOP_H" file="default_100_percent/ash/browser_stop_hover.png" type="BINDATA" /> - <include name="IDR_STOP_P" file="default_100_percent/ash/browser_stop_pressed.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_STOP" file="default_200_percent/stop.png" type="BINDATA" /> - <include name="IDR_STOP_D" file="default_100_percent/stop_disabled.png" type="BINDATA" /> - <include name="IDR_STOP_H" file="default_200_percent/stop_hover.png" type="BINDATA" /> - <include name="IDR_STOP_P" file="default_200_percent/stop_pressed.png" type="BINDATA" /> - </if> - <if expr="pp_ifdef('toolkit_views')"> - <include name="IDR_TAB_ACTIVE_CENTER" file="default_100_percent/ash/tab_active_center.png" type="BINDATA" /> - <include name="IDR_TAB_ACTIVE_LEFT" file="default_100_percent/ash/tab_active_left.png" type="BINDATA" /> - <include name="IDR_TAB_ACTIVE_RIGHT" file="default_100_percent/ash/tab_active_right.png" type="BINDATA" /> - <include name="IDR_TAB_ALPHA_LEFT" file="default_100_percent/ash/tab_alpha_left.png" type="BINDATA" /> - <include name="IDR_TAB_ALPHA_RIGHT" file="default_100_percent/ash/tab_alpha_right.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_TAB_ACTIVE_CENTER" file="default_100_percent/tab_active_center.png" type="BINDATA" /> - <include name="IDR_TAB_ACTIVE_LEFT" file="default_100_percent/tab_active_left.png" type="BINDATA" /> - <include name="IDR_TAB_ACTIVE_RIGHT" file="default_100_percent/tab_active_right.png" type="BINDATA" /> - <include name="IDR_TAB_ALPHA_LEFT" file="default_100_percent/tab_alpha_left.png" type="BINDATA" /> - <include name="IDR_TAB_ALPHA_RIGHT" file="default_100_percent/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="default_100_percent/ash/tab_close_normal.png" type="BINDATA" /> - <include name="IDR_TAB_CLOSE_H" file="default_100_percent/ash/tab_close_hover.png" type="BINDATA" /> - <include name="IDR_TAB_CLOSE_MASK" file="default_100_percent/ash/tab_close_mask.png" type="BINDATA" /> - <include name="IDR_TAB_CLOSE_P" file="default_100_percent/ash/tab_close_pressed.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_TAB_CLOSE" file="default_100_percent/tab_close.png" type="BINDATA" /> - <include name="IDR_TAB_CLOSE_H" file="default_100_percent/tab_close_hover.png" type="BINDATA" /> - <include name="IDR_TAB_CLOSE_MASK" file="default_100_percent/tab_close_mask.png" type="BINDATA" /> - <include name="IDR_TAB_CLOSE_P" file="default_100_percent/tab_close_pressed.png" type="BINDATA" /> - </if> - <include name="IDR_TAB_DROP_DOWN" file="default_200_percent/tab_drop_down.png" type="BINDATA" /> - <include name="IDR_TAB_DROP_UP" file="default_200_percent/tab_drop_up.png" type="BINDATA" /> - <if expr="pp_ifdef('toolkit_views')"> - <include name="IDR_TAB_INACTIVE_CENTER" file="default_100_percent/ash/tab_inactive_center.png" type="BINDATA" /> - <include name="IDR_TAB_INACTIVE_LEFT" file="default_100_percent/ash/tab_inactive_left.png" type="BINDATA" /> - <include name="IDR_TAB_INACTIVE_RIGHT" file="default_100_percent/ash/tab_inactive_right.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_TAB_INACTIVE_CENTER" file="default_100_percent/tab_inactive_center.png" type="BINDATA" /> - <include name="IDR_TAB_INACTIVE_LEFT" file="default_100_percent/tab_inactive_left.png" type="BINDATA" /> - <include name="IDR_TAB_INACTIVE_RIGHT" file="default_100_percent/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="default_100_percent/ash/theme_frame_default_active.png" type="BINDATA" /> - <include name="IDR_THEME_FRAME_INACTIVE" file="default_100_percent/ash/theme_frame_default_inactive.png" type="BINDATA" /> - <include name="IDR_THEME_FRAME_INCOGNITO" file="default_100_percent/ash/theme_frame_incognito_active.png" type="BINDATA" /> - <include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="default_100_percent/ash/theme_frame_incognito_inactive.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('use_ash')"> - <include name="IDR_THEME_FRAME" file="default_100_percent/theme_frame.png" type="BINDATA" /> - <include name="IDR_THEME_FRAME_INACTIVE" file="default_100_percent/theme_frame_inactive.png" type="BINDATA" /> - <include name="IDR_THEME_FRAME_INCOGNITO" file="default_100_percent/theme_frame_incognito.png" type="BINDATA" /> - <include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="default_100_percent/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="default_100_percent/ash/theme_tab_background.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('use_ash')"> - <include name="IDR_THEME_TAB_BACKGROUND" file="default_100_percent/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="default_100_percent/ash/theme_toolbar_default.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('use_ash') and is_macosx"> - <include name="IDR_THEME_TOOLBAR" file="default_200_percent/theme_toolbar_default2.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('use_ash') and not is_macosx"> - <include name="IDR_THEME_TOOLBAR" file="default_100_percent/theme_toolbar_default.png" type="BINDATA" /> - </if> - <if expr="is_macosx"> - <include name="IDR_THEME_TOOLBAR_INACTIVE" file="default_200_percent/theme_toolbar_default_inactive2.png" type="BINDATA" /> - </if> - <include name="IDR_THROBBER_WAITING" file="default_200_percent/throbber_waiting.png" type="BINDATA" /> - <if expr="pp_ifdef('toolkit_views')"> - <include name="IDR_TOOLS" file="default_100_percent/ash/browser_tools_normal.png" type="BINDATA" /> - <include name="IDR_TOOLS_H" file="default_100_percent/ash/browser_tools_hover.png" type="BINDATA" /> - <include name="IDR_TOOLS_P" file="default_100_percent/ash/browser_tools_pressed.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_TOOLS" file="default_200_percent/tools.png" type="BINDATA" /> - <include name="IDR_TOOLS_H" file="default_200_percent/tools_hover.png" type="BINDATA" /> - <include name="IDR_TOOLS_P" file="default_200_percent/tools_pressed.png" type="BINDATA" /> - </if> - <include name="IDR_ZOOM_MINUS" file="default_200_percent/zoom_minus.png" type="BINDATA" /> - <include name="IDR_ZOOM_PLUS" file="default_200_percent/zoom_plus.png" type="BINDATA" /> - </includes> - </release> -</grit> diff --git a/chrome/app/theme/theme_resources_standard.grd b/chrome/app/theme/theme_resources_standard.grd index a3e841e..5086537 100644 --- a/chrome/app/theme/theme_resources_standard.grd +++ b/chrome/app/theme/theme_resources_standard.grd @@ -1,296 +1,335 @@ <?xml version="1.0" encoding="UTF-8"?> <grit latest_public_release="0" current_release="1"> <outputs> - <output filename="grit/theme_resources_standard.h" type="rc_header"> + <output filename="grit/theme_resources_standard.h" type="rc_header" context="default_100_percent"> <emit emit_type='prepend'></emit> </output> - <output filename="grit/theme_resources_standard_map.cc" type="resource_map_source" /> - <output filename="grit/theme_resources_standard_map.h" type="resource_map_header" /> - <output filename="theme_resources_standard.pak" type="data_package" /> - <output filename="theme_resources_standard.rc" type="rc_all" /> + <output filename="grit/theme_resources_standard_map.cc" type="resource_map_source" context="default_100_percent" /> + <output filename="grit/theme_resources_standard_map.h" type="resource_map_header" context="default_100_percent" /> + <output filename="theme_resources_standard.pak" type="data_package" context="default_100_percent" /> + <output filename="theme_resources_2x.pak" type="data_package" context="default_200_percent" /> + <output filename="theme_resources_touch_1x.pak" type="data_package" context="touch_100_percent" /> + <output filename="theme_resources_touch_2x.pak" type="data_package" context="touch_200_percent" /> + <output filename="theme_resources_standard.rc" type="rc_all" context="default_100_percent" /> </outputs> <release seq="1"> - <includes> - <!-- KEEP THESE IN ALPHABETICAL ORDER AND SYNCHRONIZED WITH - theme_resources_2x.grd. THIS MEANS THAT EACH ICON IN THIS FILE - MUST HAVE AN EQUIVALENT ICON IN THE OTHER FILE. - YOU MUST ALSO REPLICATE ALL IFDEFS. --> - <include name="IDR_APP_NOTIFICATION_NUB" file="default_100_percent/nub.png" type="BINDATA" /> - <include name="IDR_APP_NOTIFICATION_NUB_MASK" file="default_100_percent/nub_mask.png" type="BINDATA" /> - <include name="IDR_APP_NOTIFICATION_SMALL_BUBBLE" file="default_100_percent/small_bubble.png" type="BINDATA" /> + <structures fallback_to_low_resolution="true"> + <!-- KEEP THESE IN ALPHABETICAL ORDER! --> + <structure type="chrome_scaled_image" name="IDR_APP_NOTIFICATION_NUB" file="nub.png" /> + <structure type="chrome_scaled_image" name="IDR_APP_NOTIFICATION_NUB_MASK" file="nub_mask.png" /> + <structure type="chrome_scaled_image" name="IDR_APP_NOTIFICATION_SMALL_BUBBLE" file="small_bubble.png" /> <!-- TODO(jamescook): Update all Chrome platforms to use the new art and metrics from Ash, crbug.com/118228 --> <if expr="pp_ifdef('toolkit_views')"> - <include name="IDR_BACK" file="default_100_percent/ash/browser_back_normal.png" type="BINDATA" /> - <include name="IDR_BACK_D" file="default_100_percent/ash/browser_back_disabled.png" type="BINDATA" /> - <include name="IDR_BACK_H" file="default_100_percent/ash/browser_back_hover.png" type="BINDATA" /> - <include name="IDR_BACK_P" file="default_100_percent/ash/browser_back_pressed.png" type="BINDATA" /> + <structure type="chrome_scaled_image" name="IDR_BACK" file="ash/browser_back_normal.png" /> + <structure type="chrome_scaled_image" name="IDR_BACK_D" file="ash/browser_back_disabled.png" /> + <structure type="chrome_scaled_image" name="IDR_BACK_H" file="ash/browser_back_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_BACK_P" file="ash/browser_back_pressed.png" /> </if> <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_BACK" file="default_100_percent/back.png" type="BINDATA" /> - <include name="IDR_BACK_D" file="default_100_percent/back_disabled.png" type="BINDATA" /> - <include name="IDR_BACK_H" file="default_100_percent/back_hover.png" type="BINDATA" /> - <include name="IDR_BACK_P" file="default_100_percent/back_pressed.png" type="BINDATA" /> - </if> - <include name="IDR_BALLOON_WRENCH" file="default_100_percent/notification_wrench.png" type="BINDATA" /> - <include name="IDR_BALLOON_WRENCH_H" file="default_100_percent/notification_wrench_hover.png" type="BINDATA" /> - <include name="IDR_BALLOON_WRENCH_P" file="default_100_percent/notification_wrench_pressed.png" type="BINDATA" /> - <include name="IDR_BLOCKED_COOKIES" file="default_100_percent/blocked_cookies.png" type="BINDATA" /> - <include name="IDR_BLOCKED_IMAGES" file="default_100_percent/blocked_images.png" type="BINDATA" /> - <include name="IDR_BLOCKED_JAVASCRIPT" file="default_100_percent/blocked_script.png" type="BINDATA" /> - <include name="IDR_BLOCKED_PLUGINS" file="default_100_percent/blocked_plugins.png" type="BINDATA" /> - <include name="IDR_BLOCKED_POPUPS" file="default_100_percent/blocked_popups.png" type="BINDATA" /> - <include name="IDR_BOOKMARKS_FAVICON" file="default_100_percent/bookmarks_favicon.png" type="BINDATA" /> + <structure type="chrome_scaled_image" name="IDR_BACK" file="back.png" /> + <structure type="chrome_scaled_image" name="IDR_BACK_D" file="back_disabled.png" /> + <structure type="chrome_scaled_image" name="IDR_BACK_H" file="back_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_BACK_P" file="back_pressed.png" /> + </if> + <structure type="chrome_scaled_image" name="IDR_BALLOON_WRENCH" file="notification_wrench.png" /> + <structure type="chrome_scaled_image" name="IDR_BALLOON_WRENCH_H" file="notification_wrench_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_BALLOON_WRENCH_P" file="notification_wrench_pressed.png" /> + <structure type="chrome_scaled_image" name="IDR_BLOCKED_COOKIES" file="blocked_cookies.png" /> + <structure type="chrome_scaled_image" name="IDR_BLOCKED_IMAGES" file="blocked_images.png" /> + <structure type="chrome_scaled_image" name="IDR_BLOCKED_JAVASCRIPT" file="blocked_script.png" /> + <structure type="chrome_scaled_image" name="IDR_BLOCKED_PLUGINS" file="blocked_plugins.png" /> + <structure type="chrome_scaled_image" name="IDR_BLOCKED_POPUPS" file="blocked_popups.png" /> + <structure type="chrome_scaled_image" name="IDR_BOOKMARKS_FAVICON" file="bookmarks_favicon.png" /> <if expr="pp_ifdef('toolkit_views')"> - <include name="IDR_BROWSER_ACTION" file="default_100_percent/ash/browser_action_normal.png" type="BINDATA" /> - <include name="IDR_BROWSER_ACTION_H" file="default_100_percent/ash/browser_action_hover.png" type="BINDATA" /> - <include name="IDR_BROWSER_ACTION_P" file="default_100_percent/ash/browser_action_pressed.png" type="BINDATA" /> + <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION" file="ash/browser_action_normal.png" /> + <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_H" file="ash/browser_action_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_P" file="ash/browser_action_pressed.png" /> </if> <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_BROWSER_ACTION" file="default_100_percent/browser_action.png" type="BINDATA" /> - <include name="IDR_BROWSER_ACTION_H" file="default_100_percent/browser_action_hover.png" type="BINDATA" /> - <include name="IDR_BROWSER_ACTION_P" file="default_100_percent/browser_action_pressed.png" type="BINDATA" /> + <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION" file="browser_action.png" /> + <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_H" file="browser_action_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_P" file="browser_action_pressed.png" /> </if> <if expr="pp_ifdef('toolkit_views')"> - <include name="IDR_BROWSER_ACTIONS_OVERFLOW" file="default_100_percent/ash/browser_actions_overflow_normal.png" type="BINDATA" /> - <include name="IDR_BROWSER_ACTIONS_OVERFLOW_H" file="default_100_percent/ash/browser_actions_overflow_hover.png" type="BINDATA" /> - <include name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="default_100_percent/ash/browser_actions_overflow_pressed.png" type="BINDATA" /> + <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTIONS_OVERFLOW" file="ash/browser_actions_overflow_normal.png" /> + <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTIONS_OVERFLOW_H" file="ash/browser_actions_overflow_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="ash/browser_actions_overflow_pressed.png" /> </if> <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_BROWSER_ACTIONS_OVERFLOW" file="default_100_percent/browser_actions_overflow.png" type="BINDATA" /> - <include name="IDR_BROWSER_ACTIONS_OVERFLOW_H" file="default_100_percent/browser_actions_overflow_hover.png" type="BINDATA" /> - <include name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="default_100_percent/browser_actions_overflow_pressed.png" type="BINDATA" /> + <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTIONS_OVERFLOW" file="browser_actions_overflow.png" /> + <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTIONS_OVERFLOW_H" file="browser_actions_overflow_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="browser_actions_overflow_pressed.png" /> </if> <if expr="is_win"> - <include name="IDR_CONFLICT_FAVICON" file="default_100_percent/about_conflicts_favicon.png" type="BINDATA" /> + <structure type="chrome_scaled_image" name="IDR_CONFLICT_FAVICON" file="about_conflicts_favicon.png" /> </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="default_100_percent/ash/content_top_center.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('use_ash')"> - <include name="IDR_CONTENT_TOP_CENTER" file="default_100_percent/content_top_center.png" type="BINDATA" /> - </if> - <include name="IDR_CONTENT_TOP_LEFT_CORNER" file="default_100_percent/content_top_left_corner.png" type="BINDATA" /> - <include name="IDR_CONTENT_TOP_LEFT_CORNER_MASK" file="default_100_percent/content_top_left_corner_mask.png" type="BINDATA" /> - <include name="IDR_CONTENT_TOP_RIGHT_CORNER" file="default_100_percent/content_top_right_corner.png" type="BINDATA" /> - <include name="IDR_CONTENT_TOP_RIGHT_CORNER_MASK" file="default_100_percent/content_top_right_corner_mask.png" type="BINDATA" /> - <include name="IDR_DOWNLOADS_FAVICON" file="default_100_percent/downloads_favicon.png" type="BINDATA" /> - <include name="IDR_FEEDBACK" file="default_100_percent/feedback.png" type="BINDATA" /> - <include name="IDR_FEEDBACK_H" file="default_100_percent/feedback_hover.png" type="BINDATA" /> - <include name="IDR_FEEDBACK_P" file="default_100_percent/feedback_pressed.png" type="BINDATA" /> - <include name="IDR_FLAGS" file="default_100_percent/flags.png" type="BINDATA" /> + <if expr="context.startswith('default_')"> + <if expr="pp_ifdef('use_ash')"> + <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_CENTER" file="ash/content_top_center.png" /> + </if> + <if expr="not pp_ifdef('use_ash')"> + <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_CENTER" file="content_top_center.png" /> + </if> + </if> + <if expr="not context.startswith('default_')"> + <!-- TODO(benrg): This is obviously wrong; fix it. --> + <if expr="pp_ifdef('use_ash')"> + <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_CENTER" file="content_top_center_ash.png" /> + </if> + <if expr="not pp_ifdef('use_ash')"> + <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_CENTER" file="ash/content_top_center.png" /> + </if> + </if> + <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_LEFT_CORNER" file="content_top_left_corner.png" /> + <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_LEFT_CORNER_MASK" file="content_top_left_corner_mask.png" /> + <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_RIGHT_CORNER" file="content_top_right_corner.png" /> + <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_RIGHT_CORNER_MASK" file="content_top_right_corner_mask.png" /> + <structure type="chrome_scaled_image" name="IDR_DOWNLOADS_FAVICON" file="downloads_favicon.png" /> + <structure type="chrome_scaled_image" name="IDR_FEEDBACK" file="feedback.png" /> + <structure type="chrome_scaled_image" name="IDR_FEEDBACK_H" file="feedback_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_FEEDBACK_P" file="feedback_pressed.png" /> + <structure type="chrome_scaled_image" name="IDR_FLAGS" file="flags.png" /> <if expr="pp_ifdef('toolkit_views')"> - <include name="IDR_FORWARD" file="default_100_percent/ash/browser_forward_normal.png" type="BINDATA" /> - <include name="IDR_FORWARD_D" file="default_100_percent/ash/browser_forward_disabled.png" type="BINDATA" /> - <include name="IDR_FORWARD_H" file="default_100_percent/ash/browser_forward_hover.png" type="BINDATA" /> - <include name="IDR_FORWARD_P" file="default_100_percent/ash/browser_forward_pressed.png" type="BINDATA" /> + <structure type="chrome_scaled_image" name="IDR_FORWARD" file="ash/browser_forward_normal.png" /> + <structure type="chrome_scaled_image" name="IDR_FORWARD_D" file="ash/browser_forward_disabled.png" /> + <structure type="chrome_scaled_image" name="IDR_FORWARD_H" file="ash/browser_forward_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_FORWARD_P" file="ash/browser_forward_pressed.png" /> </if> <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_FORWARD" file="default_100_percent/forward.png" type="BINDATA" /> - <include name="IDR_FORWARD_D" file="default_100_percent/forward_disabled.png" type="BINDATA" /> - <include name="IDR_FORWARD_H" file="default_100_percent/forward_hover.png" type="BINDATA" /> - <include name="IDR_FORWARD_P" file="default_100_percent/forward_pressed.png" type="BINDATA" /> + <structure type="chrome_scaled_image" name="IDR_FORWARD" file="forward.png" /> + <structure type="chrome_scaled_image" name="IDR_FORWARD_D" file="forward_disabled.png" /> + <structure type="chrome_scaled_image" name="IDR_FORWARD_H" file="forward_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_FORWARD_P" file="forward_pressed.png" /> </if> - <include name="IDR_GEOLOCATION_INFOBAR_ICON" file="default_100_percent/infobar_geolocation.png" type="BINDATA" /> - <include name="IDR_HISTORY_FAVICON" file="default_100_percent/history_favicon.png" type="BINDATA" /> + <structure type="chrome_scaled_image" name="IDR_GEOLOCATION_INFOBAR_ICON" file="infobar_geolocation.png" /> + <structure type="chrome_scaled_image" name="IDR_HISTORY_FAVICON" file="history_favicon.png" /> <if expr="pp_ifdef('toolkit_views')"> - <include name="IDR_HOME" file="default_100_percent/ash/browser_home_normal.png" type="BINDATA" /> - <include name="IDR_HOME_H" file="default_100_percent/ash/browser_home_hover.png" type="BINDATA" /> - <include name="IDR_HOME_P" file="default_100_percent/ash/browser_home_pressed.png" type="BINDATA" /> + <structure type="chrome_scaled_image" name="IDR_HOME" file="ash/browser_home_normal.png" /> + <structure type="chrome_scaled_image" name="IDR_HOME_H" file="ash/browser_home_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_HOME_P" file="ash/browser_home_pressed.png" /> </if> <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_HOME" file="default_100_percent/home.png" type="BINDATA" /> - <include name="IDR_HOME_H" file="default_100_percent/home_hover.png" type="BINDATA" /> - <include name="IDR_HOME_P" file="default_100_percent/home_pressed.png" type="BINDATA" /> - </if> - <include name="IDR_INFOBAR_ALT_NAV_URL" file="default_100_percent/infobar_didyoumean.png" type="BINDATA" /> - <include name="IDR_INFOBAR_AUTOFILL" file="default_100_percent/infobar_autofill.png" type="BINDATA" /> - <include name="IDR_INFOBAR_AUTOLOGIN" file="default_100_percent/infobar_autologin.png" type="BINDATA" /> - <include name="IDR_INFOBAR_COOKIE" file="default_100_percent/infobar_cookie.png" type="BINDATA" /> - <include name="IDR_INFOBAR_DESKTOP_NOTIFICATIONS" file="default_100_percent/infobar_desktop_notifications.png" type="BINDATA" /> - <include name="IDR_INFOBAR_INCOMPLETE" file="default_100_percent/infobar_incomplete.png" type="BINDATA" /> - <include name="IDR_INFOBAR_MEDIA_STREAM_CAMERA" file="default_100_percent/infobar_camera.png" type="BINDATA" /> - <include name="IDR_INFOBAR_MEDIA_STREAM_MIC" file="default_100_percent/infobar_microphone.png" type="BINDATA" /> - <include name="IDR_INFOBAR_MULTIPLE_DOWNLOADS" file="default_100_percent/infobar_multiple_downloads.png" type="BINDATA" /> - <include name="IDR_INFOBAR_PLUGIN_CRASHED" file="default_100_percent/infobar_plugin_crashed.png" type="BINDATA" /> - <include name="IDR_INFOBAR_PLUGIN_INSTALL" file="default_100_percent/infobar_plugin.png" type="BINDATA" /> - <include name="IDR_INFOBAR_QUESTION_MARK" file="default_100_percent/infobar_questionmark.png" type="BINDATA" /> - <include name="IDR_INFOBAR_RESTORE_SESSION" file="default_100_percent/infobar_restore.png" type="BINDATA" /> - <include name="IDR_INFOBAR_SAVE_PASSWORD" file="default_100_percent/infobar_savepassword.png" type="BINDATA" /> - <include name="IDR_INFOBAR_SSL_WARNING" file="default_100_percent/infobar_insecure.png" type="BINDATA" /> - <include name="IDR_INFOBAR_SYNC" file="default_100_percent/infobar_sync.png" type="BINDATA" /> - <include name="IDR_INFOBAR_THEME" file="default_100_percent/infobar_theme.png" type="BINDATA" /> - <include name="IDR_INFOBAR_TRANSLATE" file="default_100_percent/infobar_translate.png" type="BINDATA" /> - <include name="IDR_KEYWORD_SEARCH_MAGNIFIER" file="default_100_percent/keyword_search_magnifier.png" type="BINDATA" /> + <structure type="chrome_scaled_image" name="IDR_HOME" file="home.png" /> + <structure type="chrome_scaled_image" name="IDR_HOME_H" file="home_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_HOME_P" file="home_pressed.png" /> + </if> + <structure type="chrome_scaled_image" name="IDR_INFOBAR_ALT_NAV_URL" file="infobar_didyoumean.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBAR_AUTOFILL" file="infobar_autofill.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBAR_AUTOLOGIN" file="infobar_autologin.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBAR_COOKIE" file="infobar_cookie.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBAR_DESKTOP_NOTIFICATIONS" file="infobar_desktop_notifications.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBAR_INCOMPLETE" file="infobar_incomplete.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBAR_MEDIA_STREAM_CAMERA" file="infobar_camera.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBAR_MEDIA_STREAM_MIC" file="infobar_microphone.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBAR_MULTIPLE_DOWNLOADS" file="infobar_multiple_downloads.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBAR_PLUGIN_CRASHED" file="infobar_plugin_crashed.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBAR_PLUGIN_INSTALL" file="infobar_plugin.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBAR_QUESTION_MARK" file="infobar_questionmark.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBAR_RESTORE_SESSION" file="infobar_restore.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBAR_SAVE_PASSWORD" file="infobar_savepassword.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBAR_SSL_WARNING" file="infobar_insecure.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBAR_SYNC" file="infobar_sync.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBAR_THEME" file="infobar_theme.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBAR_TRANSLATE" file="infobar_translate.png" /> + <structure type="chrome_scaled_image" name="IDR_KEYWORD_SEARCH_MAGNIFIER" file="keyword_search_magnifier.png" /> <if expr="pp_ifdef('toolkit_views')"> - <include name="IDR_LOCATIONBG_C" file="default_100_percent/ash/browser_omnibox_middle.png" type="BINDATA" /> - <include name="IDR_LOCATIONBG_L" file="default_100_percent/ash/browser_omnibox_left.png" type="BINDATA" /> - <include name="IDR_LOCATIONBG_R" file="default_100_percent/ash/browser_omnibox_right.png" type="BINDATA" /> - <include name="IDR_LOCATION_BAR_BORDER" file="default_100_percent/ash/browser_omnibox_border.png" type="BINDATA" /> + <structure type="chrome_scaled_image" name="IDR_LOCATIONBG_C" file="ash/browser_omnibox_middle.png" /> + <structure type="chrome_scaled_image" name="IDR_LOCATIONBG_L" file="ash/browser_omnibox_left.png" /> + <structure type="chrome_scaled_image" name="IDR_LOCATIONBG_R" file="ash/browser_omnibox_right.png" /> + <structure type="chrome_scaled_image" name="IDR_LOCATION_BAR_BORDER" file="ash/browser_omnibox_border.png" /> </if> <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_LOCATIONBG_C" file="default_100_percent/omnibox_c.png" type="BINDATA" /> - <include name="IDR_LOCATIONBG_L" file="default_100_percent/omnibox_l.png" type="BINDATA" /> - <include name="IDR_LOCATIONBG_R" file="default_100_percent/omnibox_r.png" type="BINDATA" /> - <include name="IDR_LOCATION_BAR_BORDER" file="default_100_percent/omnibox_border.png" type="BINDATA" /> - </if> - <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_C" file="default_100_percent/keyword_search_bubble_c.png" type="BINDATA" /> - <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_L" file="default_100_percent/keyword_search_bubble_l.png" type="BINDATA" /> - <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_R" file="default_100_percent/keyword_search_bubble_r.png" type="BINDATA" /> - <include name="IDR_MOBILE" file="default_100_percent/mobile.png" type="BINDATA" /> - <include name="IDR_MOBILE_LIT" file="default_100_percent/mobile_lit.png" type="BINDATA" /> + <structure type="chrome_scaled_image" name="IDR_LOCATIONBG_C" file="omnibox_c.png" /> + <structure type="chrome_scaled_image" name="IDR_LOCATIONBG_L" file="omnibox_l.png" /> + <structure type="chrome_scaled_image" name="IDR_LOCATIONBG_R" file="omnibox_r.png" /> + <structure type="chrome_scaled_image" name="IDR_LOCATION_BAR_BORDER" file="omnibox_border.png" /> + </if> + <structure type="chrome_scaled_image" name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_C" file="keyword_search_bubble_c.png" /> + <structure type="chrome_scaled_image" name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_L" file="keyword_search_bubble_l.png" /> + <structure type="chrome_scaled_image" name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_R" file="keyword_search_bubble_r.png" /> + <structure type="chrome_scaled_image" name="IDR_MOBILE" file="mobile.png" /> + <structure type="chrome_scaled_image" name="IDR_MOBILE_LIT" file="mobile_lit.png" /> <if expr="pp_ifdef('use_ash')"> - <include name="IDR_NEWTAB_BUTTON" file="default_100_percent/ash/newtab_normal.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_H" file="default_100_percent/ash/newtab_hover.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_P" file="default_100_percent/ash/newtab_pressed.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_MASK" file="default_100_percent/ash/newtab_button_mask.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_PLUS" file="default_100_percent/newtab_views_plus.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_P_PLUS" file="default_100_percent/newtab_p_views_plus.png" type="BINDATA" /> + <!-- TODO(benrg): Get rid of all conditionals that test the output + context. --> + <if expr="context.startswith('default_')"> + <structure type="chrome_scaled_image" name="IDR_NEWTAB_BUTTON" file="ash/newtab_normal.png" /> + <structure type="chrome_scaled_image" name="IDR_NEWTAB_BUTTON_H" file="ash/newtab_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_NEWTAB_BUTTON_P" file="ash/newtab_pressed.png" /> + <structure type="chrome_scaled_image" name="IDR_NEWTAB_BUTTON_MASK" file="ash/newtab_button_mask.png" /> + </if> + <if expr="not context.startswith('default_')"> + <structure type="chrome_scaled_image" name="IDR_NEWTAB_BUTTON" file="newtab_normal.png" /> + <structure type="chrome_scaled_image" name="IDR_NEWTAB_BUTTON_H" file="newtab_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_NEWTAB_BUTTON_P" file="newtab_pressed.png" /> + <structure type="chrome_scaled_image" name="IDR_NEWTAB_BUTTON_MASK" file="newtab_button_mask.png" /> + </if> + <structure type="chrome_scaled_image" name="IDR_NEWTAB_BUTTON_PLUS" file="newtab_views_plus.png" /> + <structure type="chrome_scaled_image" name="IDR_NEWTAB_BUTTON_P_PLUS" file="newtab_p_views_plus.png" /> </if> <if expr="pp_ifdef('toolkit_views') and not pp_ifdef('use_ash')"> - <include name="IDR_NEWTAB_BUTTON" file="default_100_percent/newtab_views.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_H" file="default_100_percent/newtab_hover.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_P" file="default_100_percent/newtab_p_views.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_MASK" file="default_100_percent/newtab_button_mask_views.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_PLUS" file="default_100_percent/newtab_views_plus.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_P_PLUS" file="default_100_percent/newtab_p_views_plus.png" type="BINDATA" /> + <if expr="context.startswith('default_')"> + <structure type="chrome_scaled_image" name="IDR_NEWTAB_BUTTON" file="newtab_views.png" /> + </if> + <if expr="not context.startswith('default_')"> + <structure type="chrome_scaled_image" name="IDR_NEWTAB_BUTTON" file="newtab_normal.png" /> + </if> + <structure type="chrome_scaled_image" name="IDR_NEWTAB_BUTTON_H" file="newtab_hover.png" /> + <if expr="context.startswith('default_')"> + <structure type="chrome_scaled_image" name="IDR_NEWTAB_BUTTON_P" file="newtab_p_views.png" /> + <structure type="chrome_scaled_image" name="IDR_NEWTAB_BUTTON_MASK" file="newtab_button_mask_views.png" /> + </if> + <if expr="not context.startswith('default_')"> + <structure type="chrome_scaled_image" name="IDR_NEWTAB_BUTTON_P" file="newtab_pressed.png" /> + <structure type="chrome_scaled_image" name="IDR_NEWTAB_BUTTON_MASK" file="newtab_button_mask.png" /> + </if> + <structure type="chrome_scaled_image" name="IDR_NEWTAB_BUTTON_PLUS" file="newtab_views_plus.png" /> + <structure type="chrome_scaled_image" name="IDR_NEWTAB_BUTTON_P_PLUS" file="newtab_p_views_plus.png" /> </if> <if expr="not pp_ifdef('toolkit_views') and not pp_ifdef('use_ash')"> - <include name="IDR_NEWTAB_BUTTON" file="default_100_percent/newtab.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_H" file="default_100_percent/newtab_hover.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_P" file="default_100_percent/newtab_pressed.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_MASK" file="default_100_percent/newtab_button_mask.png" type="BINDATA" /> - </if> - <include name="IDR_SETTINGS_FAVICON" file="default_100_percent/settings_favicon.png" type="BINDATA" /> - <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_C" file="default_100_percent/ev_bubble_c.png" type="BINDATA" /> - <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_L" file="default_100_percent/ev_bubble_l.png" type="BINDATA" /> - <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_R" file="default_100_percent/ev_bubble_r.png" type="BINDATA" /> - <include name="IDR_OTR_ICON" file="default_100_percent/otr_icon.png" type="BINDATA" /> - <include name="IDR_OTR_ICON_FULLSCREEN" file="default_100_percent/otr_icon.png" type="BINDATA" /> - <include name="IDR_PLUGIN" file="default_100_percent/plugin.png" type="BINDATA" /> + <structure type="chrome_scaled_image" name="IDR_NEWTAB_BUTTON" file="newtab.png" /> + <structure type="chrome_scaled_image" name="IDR_NEWTAB_BUTTON_H" file="newtab_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_NEWTAB_BUTTON_P" file="newtab_pressed.png" /> + <structure type="chrome_scaled_image" name="IDR_NEWTAB_BUTTON_MASK" file="newtab_button_mask.png" /> + </if> + <structure type="chrome_scaled_image" name="IDR_SETTINGS_FAVICON" file="settings_favicon.png" /> + <structure type="chrome_scaled_image" name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_C" file="ev_bubble_c.png" /> + <structure type="chrome_scaled_image" name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_L" file="ev_bubble_l.png" /> + <structure type="chrome_scaled_image" name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_R" file="ev_bubble_r.png" /> + <structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="otr_icon.png" /> + <if expr="context.startswith('default_')"> + <structure type="chrome_scaled_image" name="IDR_OTR_ICON_FULLSCREEN" file="otr_icon.png" /> + </if> + <if expr="not context.startswith('default_')"> + <structure type="chrome_scaled_image" name="IDR_OTR_ICON_FULLSCREEN" file="otr_icon_fullscreen.png" /> + </if> + <structure type="chrome_scaled_image" name="IDR_PLUGIN" file="plugin.png" /> <if expr="pp_ifdef('toolkit_views')"> - <include name="IDR_RELOAD" file="default_100_percent/ash/browser_reload_normal.png" type="BINDATA" /> - <include name="IDR_RELOAD_H" file="default_100_percent/ash/browser_reload_hover.png" type="BINDATA" /> - <include name="IDR_RELOAD_P" file="default_100_percent/ash/browser_reload_pressed.png" type="BINDATA" /> + <structure type="chrome_scaled_image" name="IDR_RELOAD" file="ash/browser_reload_normal.png" /> + <structure type="chrome_scaled_image" name="IDR_RELOAD_H" file="ash/browser_reload_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_RELOAD_P" file="ash/browser_reload_pressed.png" /> </if> <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_RELOAD" file="default_100_percent/reload.png" type="BINDATA" /> - <include name="IDR_RELOAD_H" file="default_100_percent/reload_hover.png" type="BINDATA" /> - <include name="IDR_RELOAD_P" file="default_100_percent/reload_pressed.png" type="BINDATA" /> + <structure type="chrome_scaled_image" name="IDR_RELOAD" file="reload.png" /> + <structure type="chrome_scaled_image" name="IDR_RELOAD_H" file="reload_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_RELOAD_P" file="reload_pressed.png" /> </if> - <include name="IDR_SAD_FAVICON" file="default_100_percent/sadfavicon.png" type="BINDATA" /> - <include name="IDR_STAR" file="default_100_percent/star.png" type="BINDATA" /> - <include name="IDR_STAR_LIT" file="default_100_percent/star_lit.png" type="BINDATA" /> + <structure type="chrome_scaled_image" name="IDR_SAD_FAVICON" file="sadfavicon.png" /> + <structure type="chrome_scaled_image" name="IDR_STAR" file="star.png" /> + <structure type="chrome_scaled_image" name="IDR_STAR_LIT" file="star_lit.png" /> <if expr="pp_ifdef('chromeos')"> - <include name="IDR_STATUSBAR_NETWORK_ARCS_DARK" file="default_100_percent/statusbar_network_arcs_dark.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_NETWORK_ARCS_LIGHT" file="default_100_percent/statusbar_network_arcs_light.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_NETWORK_BARS_DARK" file="default_100_percent/statusbar_network_bars_dark.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_NETWORK_BARS_LIGHT" file="default_100_percent/statusbar_network_bars_light.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_NETWORK_SECURE" file="default_100_percent/statusbar_network_secure.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_VPN" file="default_100_percent/statusbar_vpn_dark.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_WIRED" file="default_100_percent/statusbar_wired.png" type="BINDATA" /> - </if> - <include name="IDR_ACTION_BOX_BUTTON" file="default_100_percent/action_box_button.png" type="BINDATA" /> + <structure type="chrome_scaled_image" name="IDR_STATUSBAR_NETWORK_ARCS_DARK" file="statusbar_network_arcs_dark.png" /> + <structure type="chrome_scaled_image" name="IDR_STATUSBAR_NETWORK_ARCS_LIGHT" file="statusbar_network_arcs_light.png" /> + <structure type="chrome_scaled_image" name="IDR_STATUSBAR_NETWORK_BARS_DARK" file="statusbar_network_bars_dark.png" /> + <structure type="chrome_scaled_image" name="IDR_STATUSBAR_NETWORK_BARS_LIGHT" file="statusbar_network_bars_light.png" /> + <structure type="chrome_scaled_image" name="IDR_STATUSBAR_NETWORK_SECURE" file="statusbar_network_secure.png" /> + <structure type="chrome_scaled_image" name="IDR_STATUSBAR_VPN" file="statusbar_vpn_dark.png" /> + <structure type="chrome_scaled_image" name="IDR_STATUSBAR_WIRED" file="statusbar_wired.png" /> + </if> + <structure type="chrome_scaled_image" name="IDR_ACTION_BOX_BUTTON" file="action_box_button.png" /> <if expr="pp_ifdef('toolkit_views')"> - <include name="IDR_STOP" file="default_100_percent/ash/browser_stop_normal.png" type="BINDATA" /> - <include name="IDR_STOP_D" file="default_100_percent/ash/browser_stop_disabled.png" type="BINDATA" /> - <include name="IDR_STOP_H" file="default_100_percent/ash/browser_stop_hover.png" type="BINDATA" /> - <include name="IDR_STOP_P" file="default_100_percent/ash/browser_stop_pressed.png" type="BINDATA" /> + <structure type="chrome_scaled_image" name="IDR_STOP" file="ash/browser_stop_normal.png" /> + <structure type="chrome_scaled_image" name="IDR_STOP_D" file="ash/browser_stop_disabled.png" /> + <structure type="chrome_scaled_image" name="IDR_STOP_H" file="ash/browser_stop_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_STOP_P" file="ash/browser_stop_pressed.png" /> </if> <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_STOP" file="default_100_percent/stop.png" type="BINDATA" /> - <include name="IDR_STOP_D" file="default_100_percent/stop_disabled.png" type="BINDATA" /> - <include name="IDR_STOP_H" file="default_100_percent/stop_hover.png" type="BINDATA" /> - <include name="IDR_STOP_P" file="default_100_percent/stop_pressed.png" type="BINDATA" /> + <structure type="chrome_scaled_image" name="IDR_STOP" file="stop.png" /> + <structure type="chrome_scaled_image" name="IDR_STOP_D" file="stop_disabled.png" /> + <structure type="chrome_scaled_image" name="IDR_STOP_H" file="stop_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_STOP_P" file="stop_pressed.png" /> </if> <if expr="pp_ifdef('toolkit_views')"> - <include name="IDR_TAB_ACTIVE_CENTER" file="default_100_percent/ash/tab_active_center.png" type="BINDATA" /> - <include name="IDR_TAB_ACTIVE_LEFT" file="default_100_percent/ash/tab_active_left.png" type="BINDATA" /> - <include name="IDR_TAB_ACTIVE_RIGHT" file="default_100_percent/ash/tab_active_right.png" type="BINDATA" /> - <include name="IDR_TAB_ALPHA_LEFT" file="default_100_percent/ash/tab_alpha_left.png" type="BINDATA" /> - <include name="IDR_TAB_ALPHA_RIGHT" file="default_100_percent/ash/tab_alpha_right.png" type="BINDATA" /> + <structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_CENTER" file="ash/tab_active_center.png" /> + <structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_LEFT" file="ash/tab_active_left.png" /> + <structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_RIGHT" file="ash/tab_active_right.png" /> + <structure type="chrome_scaled_image" name="IDR_TAB_ALPHA_LEFT" file="ash/tab_alpha_left.png" /> + <structure type="chrome_scaled_image" name="IDR_TAB_ALPHA_RIGHT" file="ash/tab_alpha_right.png" /> </if> <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_TAB_ACTIVE_CENTER" file="default_100_percent/tab_active_center.png" type="BINDATA" /> - <include name="IDR_TAB_ACTIVE_LEFT" file="default_100_percent/tab_active_left.png" type="BINDATA" /> - <include name="IDR_TAB_ACTIVE_RIGHT" file="default_100_percent/tab_active_right.png" type="BINDATA" /> - <include name="IDR_TAB_ALPHA_LEFT" file="default_100_percent/tab_alpha_left.png" type="BINDATA" /> - <include name="IDR_TAB_ALPHA_RIGHT" file="default_100_percent/tab_alpha_right.png" type="BINDATA" /> + <structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_CENTER" file="tab_active_center.png" /> + <structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_LEFT" file="tab_active_left.png" /> + <structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_RIGHT" file="tab_active_right.png" /> + <structure type="chrome_scaled_image" name="IDR_TAB_ALPHA_LEFT" file="tab_alpha_left.png" /> + <structure type="chrome_scaled_image" name="IDR_TAB_ALPHA_RIGHT" file="tab_alpha_right.png" /> </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="default_100_percent/ash/tab_close_normal.png" type="BINDATA" /> - <include name="IDR_TAB_CLOSE_H" file="default_100_percent/ash/tab_close_hover.png" type="BINDATA" /> - <include name="IDR_TAB_CLOSE_MASK" file="default_100_percent/ash/tab_close_mask.png" type="BINDATA" /> - <include name="IDR_TAB_CLOSE_P" file="default_100_percent/ash/tab_close_pressed.png" type="BINDATA" /> + <structure type="chrome_scaled_image" name="IDR_TAB_CLOSE" file="ash/tab_close_normal.png" /> + <structure type="chrome_scaled_image" name="IDR_TAB_CLOSE_H" file="ash/tab_close_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_TAB_CLOSE_MASK" file="ash/tab_close_mask.png" /> + <structure type="chrome_scaled_image" name="IDR_TAB_CLOSE_P" file="ash/tab_close_pressed.png" /> </if> <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_TAB_CLOSE" file="default_100_percent/tab_close.png" type="BINDATA" /> - <include name="IDR_TAB_CLOSE_H" file="default_100_percent/tab_close_hover.png" type="BINDATA" /> - <include name="IDR_TAB_CLOSE_MASK" file="default_100_percent/tab_close_mask.png" type="BINDATA" /> - <include name="IDR_TAB_CLOSE_P" file="default_100_percent/tab_close_pressed.png" type="BINDATA" /> + <structure type="chrome_scaled_image" name="IDR_TAB_CLOSE" file="tab_close.png" /> + <structure type="chrome_scaled_image" name="IDR_TAB_CLOSE_H" file="tab_close_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_TAB_CLOSE_MASK" file="tab_close_mask.png" /> + <structure type="chrome_scaled_image" name="IDR_TAB_CLOSE_P" file="tab_close_pressed.png" /> </if> - <include name="IDR_TAB_DROP_DOWN" file="default_100_percent/tab_drop_down.png" type="BINDATA" /> - <include name="IDR_TAB_DROP_UP" file="default_100_percent/tab_drop_up.png" type="BINDATA" /> + <structure type="chrome_scaled_image" name="IDR_TAB_DROP_DOWN" file="tab_drop_down.png" /> + <structure type="chrome_scaled_image" name="IDR_TAB_DROP_UP" file="tab_drop_up.png" /> <if expr="pp_ifdef('toolkit_views')"> - <include name="IDR_TAB_INACTIVE_CENTER" file="default_100_percent/ash/tab_inactive_center.png" type="BINDATA" /> - <include name="IDR_TAB_INACTIVE_LEFT" file="default_100_percent/ash/tab_inactive_left.png" type="BINDATA" /> - <include name="IDR_TAB_INACTIVE_RIGHT" file="default_100_percent/ash/tab_inactive_right.png" type="BINDATA" /> + <structure type="chrome_scaled_image" name="IDR_TAB_INACTIVE_CENTER" file="ash/tab_inactive_center.png" /> + <structure type="chrome_scaled_image" name="IDR_TAB_INACTIVE_LEFT" file="ash/tab_inactive_left.png" /> + <structure type="chrome_scaled_image" name="IDR_TAB_INACTIVE_RIGHT" file="ash/tab_inactive_right.png" /> </if> <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_TAB_INACTIVE_CENTER" file="default_100_percent/tab_inactive_center.png" type="BINDATA" /> - <include name="IDR_TAB_INACTIVE_LEFT" file="default_100_percent/tab_inactive_left.png" type="BINDATA" /> - <include name="IDR_TAB_INACTIVE_RIGHT" file="default_100_percent/tab_inactive_right.png" type="BINDATA" /> + <structure type="chrome_scaled_image" name="IDR_TAB_INACTIVE_CENTER" file="tab_inactive_center.png" /> + <structure type="chrome_scaled_image" name="IDR_TAB_INACTIVE_LEFT" file="tab_inactive_left.png" /> + <structure type="chrome_scaled_image" name="IDR_TAB_INACTIVE_RIGHT" file="tab_inactive_right.png" /> </if> <!-- Ash has a gray frame, Windows uses blue. --> <if expr="pp_ifdef('use_ash')"> - <include name="IDR_THEME_FRAME" file="default_100_percent/ash/theme_frame_default_active.png" type="BINDATA" /> - <include name="IDR_THEME_FRAME_INACTIVE" file="default_100_percent/ash/theme_frame_default_inactive.png" type="BINDATA" /> - <include name="IDR_THEME_FRAME_INCOGNITO" file="default_100_percent/ash/theme_frame_incognito_active.png" type="BINDATA" /> - <include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="default_100_percent/ash/theme_frame_incognito_inactive.png" type="BINDATA" /> + <structure type="chrome_scaled_image" name="IDR_THEME_FRAME" file="ash/theme_frame_default_active.png" /> + <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INACTIVE" file="ash/theme_frame_default_inactive.png" /> + <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO" file="ash/theme_frame_incognito_active.png" /> + <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="ash/theme_frame_incognito_inactive.png" /> </if> <if expr="not pp_ifdef('use_ash')"> - <include name="IDR_THEME_FRAME" file="default_100_percent/theme_frame.png" type="BINDATA" /> - <include name="IDR_THEME_FRAME_INACTIVE" file="default_100_percent/theme_frame_inactive.png" type="BINDATA" /> - <include name="IDR_THEME_FRAME_INCOGNITO" file="default_100_percent/theme_frame_incognito.png" type="BINDATA" /> - <include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="default_100_percent/theme_frame_incognito_inactive.png" type="BINDATA" /> + <structure type="chrome_scaled_image" name="IDR_THEME_FRAME" file="theme_frame.png" /> + <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INACTIVE" file="theme_frame_inactive.png" /> + <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO" file="theme_frame_incognito.png" /> + <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="theme_frame_incognito_inactive.png" /> </if> <!-- Ash has gray tab backgrounds, Windows uses blue. --> <if expr="pp_ifdef('use_ash')"> - <include name="IDR_THEME_TAB_BACKGROUND" file="default_100_percent/ash/theme_tab_background.png" type="BINDATA" /> + <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND" file="ash/theme_tab_background.png" /> </if> <if expr="not pp_ifdef('use_ash')"> - <include name="IDR_THEME_TAB_BACKGROUND" file="default_100_percent/theme_tab_background.png" type="BINDATA" /> + <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND" file="theme_tab_background.png" /> </if> <!-- Ash has a dark gray toolbar background, Windows has light gray. --> <if expr="pp_ifdef('use_ash')"> - <include name="IDR_THEME_TOOLBAR" file="default_100_percent/ash/theme_toolbar_default.png" type="BINDATA" /> + <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR" file="ash/theme_toolbar_default.png" /> </if> <if expr="not pp_ifdef('use_ash') and is_macosx"> - <include name="IDR_THEME_TOOLBAR" file="default_100_percent/theme_toolbar_default2.png" type="BINDATA" /> + <!-- TODO(jamescook): Is this right? --> + <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR" file="theme_toolbar_default2.png" /> </if> <if expr="not pp_ifdef('use_ash') and not is_macosx"> - <include name="IDR_THEME_TOOLBAR" file="default_100_percent/theme_toolbar_default.png" type="BINDATA" /> + <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR" file="theme_toolbar_default.png" /> </if> <if expr="is_macosx"> - <include name="IDR_THEME_TOOLBAR_INACTIVE" file="default_100_percent/theme_toolbar_default_inactive2.png" type="BINDATA" /> + <!-- TODO(jamescook): Is this right? --> + <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR_INACTIVE" file="theme_toolbar_default_inactive2.png" /> </if> - <include name="IDR_THROBBER_WAITING" file="default_100_percent/throbber_waiting.png" type="BINDATA" /> + <structure type="chrome_scaled_image" name="IDR_THROBBER_WAITING" file="throbber_waiting.png" /> <if expr="pp_ifdef('toolkit_views')"> - <include name="IDR_TOOLS" file="default_100_percent/ash/browser_tools_normal.png" type="BINDATA" /> - <include name="IDR_TOOLS_H" file="default_100_percent/ash/browser_tools_hover.png" type="BINDATA" /> - <include name="IDR_TOOLS_P" file="default_100_percent/ash/browser_tools_pressed.png" type="BINDATA" /> + <structure type="chrome_scaled_image" name="IDR_TOOLS" file="ash/browser_tools_normal.png" /> + <structure type="chrome_scaled_image" name="IDR_TOOLS_H" file="ash/browser_tools_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_TOOLS_P" file="ash/browser_tools_pressed.png" /> </if> <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_TOOLS" file="default_100_percent/tools.png" type="BINDATA" /> - <include name="IDR_TOOLS_H" file="default_100_percent/tools_hover.png" type="BINDATA" /> - <include name="IDR_TOOLS_P" file="default_100_percent/tools_pressed.png" type="BINDATA" /> + <structure type="chrome_scaled_image" name="IDR_TOOLS" file="tools.png" /> + <structure type="chrome_scaled_image" name="IDR_TOOLS_H" file="tools_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_TOOLS_P" file="tools_pressed.png" /> </if> - <include name="IDR_ZOOM_MINUS" file="default_100_percent/zoom_minus.png" type="BINDATA" /> - <include name="IDR_ZOOM_PLUS" file="default_100_percent/zoom_plus.png" type="BINDATA" /> - </includes> + <structure type="chrome_scaled_image" name="IDR_ZOOM_MINUS" file="zoom_minus.png" /> + <structure type="chrome_scaled_image" name="IDR_ZOOM_PLUS" file="zoom_plus.png" /> + </structures> </release> </grit> diff --git a/chrome/app/theme/theme_resources_touch_1x.grd b/chrome/app/theme/theme_resources_touch_1x.grd deleted file mode 100644 index c72f12b..0000000 --- a/chrome/app/theme/theme_resources_touch_1x.grd +++ /dev/null @@ -1,295 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<grit latest_public_release="0" current_release="1"> - <outputs> - <output filename="grit/theme_resources_touch_1x.h" type="rc_header"> - <emit emit_type='prepend'></emit> - </output> - <output filename="theme_resources_touch_1x.pak" type="data_package" /> - </outputs> - <release seq="1"> - <includes> - <!-- KEEP THESE IN ALPHABETICAL ORDER AND SYNCHRONIZED WITH - theme_resources_standard.grd. THIS MEANS THAT EACH ICON IN THIS FILE - MUST HAVE AN EQUIVALENT ICON IN THE OTHER FILE. - YOU MUST ALSO REPLICATE ALL IFDEFS. --> - <include name="IDR_APP_NOTIFICATION_NUB" file="default_100_percent/nub.png" type="BINDATA" /> - <include name="IDR_APP_NOTIFICATION_NUB_MASK" file="default_100_percent/nub_mask.png" type="BINDATA" /> - <include name="IDR_APP_NOTIFICATION_SMALL_BUBBLE" file="default_100_percent/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('toolkit_views')"> - <include name="IDR_BACK" file="touch_100_percent/ash/browser_back_normal.png" type="BINDATA" /> - <include name="IDR_BACK_D" file="touch_100_percent/ash/browser_back_disabled.png" type="BINDATA" /> - <include name="IDR_BACK_H" file="touch_100_percent/ash/browser_back_hover.png" type="BINDATA" /> - <include name="IDR_BACK_P" file="touch_100_percent/ash/browser_back_pressed.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_BACK" file="default_100_percent/back.png" type="BINDATA" /> - <include name="IDR_BACK_D" file="default_100_percent/back_disabled.png" type="BINDATA" /> - <include name="IDR_BACK_H" file="default_100_percent/back_hover.png" type="BINDATA" /> - <include name="IDR_BACK_P" file="default_100_percent/back_pressed.png" type="BINDATA" /> - </if> - <include name="IDR_BALLOON_WRENCH" file="touch_100_percent/notification_wrench.png" type="BINDATA" /> - <include name="IDR_BALLOON_WRENCH_H" file="touch_100_percent/notification_wrench_hover.png" type="BINDATA" /> - <include name="IDR_BALLOON_WRENCH_P" file="touch_100_percent/notification_wrench_pressed.png" type="BINDATA" /> - <include name="IDR_BLOCKED_COOKIES" file="touch_100_percent/blocked_cookies.png" type="BINDATA" /> - <include name="IDR_BLOCKED_IMAGES" file="touch_100_percent/blocked_images.png" type="BINDATA" /> - <include name="IDR_BLOCKED_JAVASCRIPT" file="touch_100_percent/blocked_script.png" type="BINDATA" /> - <include name="IDR_BLOCKED_PLUGINS" file="touch_100_percent/blocked_plugins.png" type="BINDATA" /> - <include name="IDR_BLOCKED_POPUPS" file="touch_100_percent/blocked_popups.png" type="BINDATA" /> - <include name="IDR_BOOKMARKS_FAVICON" file="touch_100_percent/bookmarks_favicon.png" type="BINDATA" /> - <if expr="pp_ifdef('toolkit_views')"> - <include name="IDR_BROWSER_ACTION" file="touch_100_percent/ash/browser_action_normal.png" type="BINDATA" /> - <include name="IDR_BROWSER_ACTION_H" file="touch_100_percent/ash/browser_action_hover.png" type="BINDATA" /> - <include name="IDR_BROWSER_ACTION_P" file="touch_100_percent/ash/browser_action_pressed.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_BROWSER_ACTION" file="default_100_percent/browser_action.png" type="BINDATA" /> - <include name="IDR_BROWSER_ACTION_H" file="default_100_percent/browser_action_hover.png" type="BINDATA" /> - <include name="IDR_BROWSER_ACTION_P" file="default_100_percent/browser_action_pressed.png" type="BINDATA" /> - </if> - <if expr="pp_ifdef('toolkit_views')"> - <include name="IDR_BROWSER_ACTIONS_OVERFLOW" file="touch_100_percent/ash/browser_actions_overflow_normal.png" type="BINDATA" /> - <include name="IDR_BROWSER_ACTIONS_OVERFLOW_H" file="touch_100_percent/ash/browser_actions_overflow_hover.png" type="BINDATA" /> - <include name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="touch_100_percent/ash/browser_actions_overflow_pressed.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_BROWSER_ACTIONS_OVERFLOW" file="default_100_percent/browser_actions_overflow.png" type="BINDATA" /> - <include name="IDR_BROWSER_ACTIONS_OVERFLOW_H" file="default_100_percent/browser_actions_overflow_hover.png" type="BINDATA" /> - <include name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="default_100_percent/browser_actions_overflow_pressed.png" type="BINDATA" /> - </if> - <if expr="is_win"> - <include name="IDR_CONFLICT_FAVICON" file="touch_100_percent/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="touch_100_percent/content_top_center_ash.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('use_ash')"> - <include name="IDR_CONTENT_TOP_CENTER" file="touch_100_percent/ash/content_top_center.png" type="BINDATA" /> - </if> - <include name="IDR_CONTENT_TOP_LEFT_CORNER" file="touch_100_percent/content_top_left_corner.png" type="BINDATA" /> - <include name="IDR_CONTENT_TOP_LEFT_CORNER_MASK" file="touch_100_percent/content_top_left_corner_mask.png" type="BINDATA" /> - <include name="IDR_CONTENT_TOP_RIGHT_CORNER" file="touch_100_percent/content_top_right_corner.png" type="BINDATA" /> - <include name="IDR_CONTENT_TOP_RIGHT_CORNER_MASK" file="touch_100_percent/content_top_right_corner_mask.png" type="BINDATA" /> - <include name="IDR_DOWNLOADS_FAVICON" file="touch_100_percent/downloads_favicon.png" type="BINDATA" /> - <include name="IDR_FEEDBACK" file="touch_100_percent/feedback.png" type="BINDATA" /> - <include name="IDR_FEEDBACK_H" file="touch_100_percent/feedback_hover.png" type="BINDATA" /> - <include name="IDR_FEEDBACK_P" file="touch_100_percent/feedback_pressed.png" type="BINDATA" /> - <include name="IDR_FLAGS" file="touch_100_percent/flags.png" type="BINDATA" /> - <if expr="pp_ifdef('toolkit_views')"> - <include name="IDR_FORWARD" file="touch_100_percent/ash/browser_forward_normal.png" type="BINDATA" /> - <include name="IDR_FORWARD_D" file="touch_100_percent/ash/browser_forward_disabled.png" type="BINDATA" /> - <include name="IDR_FORWARD_H" file="touch_100_percent/ash/browser_forward_hover.png" type="BINDATA" /> - <include name="IDR_FORWARD_P" file="touch_100_percent/ash/browser_forward_pressed.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_FORWARD" file="default_100_percent/forward.png" type="BINDATA" /> - <include name="IDR_FORWARD_D" file="default_100_percent/forward_disabled.png" type="BINDATA" /> - <include name="IDR_FORWARD_H" file="default_100_percent/forward_hover.png" type="BINDATA" /> - <include name="IDR_FORWARD_P" file="default_100_percent/forward_pressed.png" type="BINDATA" /> - </if> - <include name="IDR_GEOLOCATION_INFOBAR_ICON" file="touch_100_percent/infobar_geolocation.png" type="BINDATA" /> - <include name="IDR_HISTORY_FAVICON" file="touch_100_percent/history_favicon.png" type="BINDATA" /> - <if expr="pp_ifdef('toolkit_views')"> - <include name="IDR_HOME" file="touch_100_percent/ash/browser_home_normal.png" type="BINDATA" /> - <include name="IDR_HOME_H" file="touch_100_percent/ash/browser_home_hover.png" type="BINDATA" /> - <include name="IDR_HOME_P" file="touch_100_percent/ash/browser_home_pressed.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_HOME" file="default_100_percent/home.png" type="BINDATA" /> - <include name="IDR_HOME_H" file="default_100_percent/home_hover.png" type="BINDATA" /> - <include name="IDR_HOME_P" file="default_100_percent/home_pressed.png" type="BINDATA" /> - </if> - <include name="IDR_INFOBAR_ALT_NAV_URL" file="touch_100_percent/infobar_didyoumean.png" type="BINDATA" /> - <include name="IDR_INFOBAR_AUTOFILL" file="touch_100_percent/infobar_autofill.png" type="BINDATA" /> - <include name="IDR_INFOBAR_AUTOLOGIN" file="touch_100_percent/infobar_autologin.png" type="BINDATA" /> - <include name="IDR_INFOBAR_COOKIE" file="touch_100_percent/infobar_cookie.png" type="BINDATA" /> - <include name="IDR_INFOBAR_DESKTOP_NOTIFICATIONS" file="touch_100_percent/infobar_desktop_notifications.png" type="BINDATA" /> - <include name="IDR_INFOBAR_INCOMPLETE" file="touch_100_percent/infobar_incomplete.png" type="BINDATA" /> - <include name="IDR_INFOBAR_MEDIA_STREAM_CAMERA" file="touch_100_percent/infobar_camera.png" type="BINDATA" /> - <include name="IDR_INFOBAR_MEDIA_STREAM_MIC" file="touch_100_percent/infobar_microphone.png" type="BINDATA" /> - <include name="IDR_INFOBAR_MULTIPLE_DOWNLOADS" file="touch_100_percent/infobar_multiple_downloads.png" type="BINDATA" /> - <include name="IDR_INFOBAR_PLUGIN_CRASHED" file="touch_100_percent/infobar_plugin_crashed.png" type="BINDATA" /> - <include name="IDR_INFOBAR_PLUGIN_INSTALL" file="touch_100_percent/infobar_plugin.png" type="BINDATA" /> - <include name="IDR_INFOBAR_QUESTION_MARK" file="touch_100_percent/infobar_questionmark.png" type="BINDATA" /> - <include name="IDR_INFOBAR_RESTORE_SESSION" file="touch_100_percent/infobar_restore.png" type="BINDATA" /> - <include name="IDR_INFOBAR_SAVE_PASSWORD" file="touch_100_percent/infobar_savepassword.png" type="BINDATA" /> - <include name="IDR_INFOBAR_SSL_WARNING" file="touch_100_percent/infobar_insecure.png" type="BINDATA" /> - <include name="IDR_INFOBAR_SYNC" file="touch_100_percent/infobar_sync.png" type="BINDATA" /> - <include name="IDR_INFOBAR_THEME" file="touch_100_percent/infobar_theme.png" type="BINDATA" /> - <include name="IDR_INFOBAR_TRANSLATE" file="touch_100_percent/infobar_translate.png" type="BINDATA" /> - <include name="IDR_KEYWORD_SEARCH_MAGNIFIER" file="touch_100_percent/keyword_search_magnifier.png" type="BINDATA" /> - <if expr="pp_ifdef('toolkit_views')"> - <include name="IDR_LOCATIONBG_C" file="touch_100_percent/ash/browser_omnibox_middle.png" type="BINDATA" /> - <include name="IDR_LOCATIONBG_L" file="touch_100_percent/ash/browser_omnibox_left.png" type="BINDATA" /> - <include name="IDR_LOCATIONBG_R" file="touch_100_percent/ash/browser_omnibox_right.png" type="BINDATA" /> - <include name="IDR_LOCATION_BAR_BORDER" file="touch_100_percent/ash/browser_omnibox_border.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_LOCATIONBG_C" file="default_100_percent/omnibox_c.png" type="BINDATA" /> - <include name="IDR_LOCATIONBG_L" file="default_100_percent/omnibox_l.png" type="BINDATA" /> - <include name="IDR_LOCATIONBG_R" file="default_100_percent/omnibox_r.png" type="BINDATA" /> - <include name="IDR_LOCATION_BAR_BORDER" file="default_100_percent/omnibox_border.png" type="BINDATA" /> - </if> - <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_C" file="touch_100_percent/keyword_search_bubble_c.png" type="BINDATA" /> - <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_L" file="touch_100_percent/keyword_search_bubble_l.png" type="BINDATA" /> - <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_R" file="touch_100_percent/keyword_search_bubble_r.png" type="BINDATA" /> - <include name="IDR_MOBILE" file="touch_100_percent/mobile.png" type="BINDATA" /> - <include name="IDR_MOBILE_LIT" file="touch_100_percent/mobile_lit.png" type="BINDATA" /> - <if expr="pp_ifdef('use_ash')"> - <include name="IDR_NEWTAB_BUTTON" file="touch_100_percent/newtab_normal.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_H" file="touch_100_percent/newtab_hover.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_P" file="touch_100_percent/newtab_pressed.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_MASK" file="touch_100_percent/newtab_button_mask.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_PLUS" file="default_100_percent/newtab_views_plus.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_P_PLUS" file="default_100_percent/newtab_p_views_plus.png" type="BINDATA" /> - </if> - <if expr="pp_ifdef('toolkit_views') and not pp_ifdef('use_ash')"> - <include name="IDR_NEWTAB_BUTTON" file="touch_100_percent/newtab_normal.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_H" file="touch_100_percent/newtab_hover.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_P" file="touch_100_percent/newtab_pressed.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_MASK" file="touch_100_percent/newtab_button_mask.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_PLUS" file="default_100_percent/newtab_views_plus.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_P_PLUS" file="default_100_percent/newtab_p_views_plus.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('toolkit_views') and not pp_ifdef('use_ash')"> - <include name="IDR_NEWTAB_BUTTON" file="default_100_percent/newtab.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_H" file="default_100_percent/newtab_hover.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_P" file="default_100_percent/newtab_pressed.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_MASK" file="default_100_percent/newtab_button_mask.png" type="BINDATA" /> - </if> - <include name="IDR_SETTINGS_FAVICON" file="touch_100_percent/settings_favicon.png" type="BINDATA" /> - <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_C" file="touch_100_percent/ev_bubble_c.png" type="BINDATA" /> - <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_L" file="touch_100_percent/ev_bubble_l.png" type="BINDATA" /> - <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_R" file="touch_100_percent/ev_bubble_r.png" type="BINDATA" /> - <include name="IDR_OTR_ICON" file="touch_100_percent/otr_icon.png" type="BINDATA" /> - <include name="IDR_OTR_ICON_FULLSCREEN" file="touch_100_percent/otr_icon_fullscreen.png" type="BINDATA" /> - <include name="IDR_PLUGIN" file="touch_100_percent/plugin.png" type="BINDATA" /> - <if expr="pp_ifdef('toolkit_views')"> - <include name="IDR_RELOAD" file="touch_100_percent/ash/browser_reload_normal.png" type="BINDATA" /> - <include name="IDR_RELOAD_H" file="touch_100_percent/ash/browser_reload_hover.png" type="BINDATA" /> - <include name="IDR_RELOAD_P" file="touch_100_percent/ash/browser_reload_pressed.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_RELOAD" file="default_100_percent/reload.png" type="BINDATA" /> - <include name="IDR_RELOAD_H" file="default_100_percent/reload_hover.png" type="BINDATA" /> - <include name="IDR_RELOAD_P" file="default_100_percent/reload_pressed.png" type="BINDATA" /> - </if> - <include name="IDR_SAD_FAVICON" file="touch_100_percent/sadfavicon.png" type="BINDATA" /> - <include name="IDR_STAR" file="touch_100_percent/star.png" type="BINDATA" /> - <include name="IDR_STAR_LIT" file="touch_100_percent/star_lit.png" type="BINDATA" /> - <if expr="pp_ifdef('chromeos')"> - <include name="IDR_STATUSBAR_NETWORK_ARCS_DARK" file="default_100_percent/statusbar_network_arcs_dark.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_NETWORK_ARCS_LIGHT" file="default_100_percent/statusbar_network_arcs_light.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_NETWORK_BARS_DARK" file="default_100_percent/statusbar_network_bars_dark.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_NETWORK_BARS_LIGHT" file="default_100_percent/statusbar_network_bars_light.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_NETWORK_SECURE" file="default_100_percent/statusbar_network_secure.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_VPN" file="default_100_percent/statusbar_vpn_dark.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_WIRED" file="default_100_percent/statusbar_wired.png" type="BINDATA" /> - </if> - <include name="IDR_ACTION_BOX_BUTTON" file="default_100_percent/action_box_button.png" type="BINDATA" /> - <if expr="pp_ifdef('toolkit_views')"> - <include name="IDR_STOP" file="touch_100_percent/ash/browser_stop_normal.png" type="BINDATA" /> - <include name="IDR_STOP_D" file="touch_100_percent/ash/browser_stop_disabled.png" type="BINDATA" /> - <include name="IDR_STOP_H" file="touch_100_percent/ash/browser_stop_hover.png" type="BINDATA" /> - <include name="IDR_STOP_P" file="touch_100_percent/ash/browser_stop_pressed.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_STOP" file="default_100_percent/stop.png" type="BINDATA" /> - <include name="IDR_STOP_D" file="default_100_percent/stop_disabled.png" type="BINDATA" /> - <include name="IDR_STOP_H" file="default_100_percent/stop_hover.png" type="BINDATA" /> - <include name="IDR_STOP_P" file="default_100_percent/stop_pressed.png" type="BINDATA" /> - </if> - <if expr="pp_ifdef('toolkit_views')"> - <include name="IDR_TAB_ACTIVE_CENTER" file="touch_100_percent/ash/tab_active_center.png" type="BINDATA" /> - <include name="IDR_TAB_ACTIVE_LEFT" file="touch_100_percent/ash/tab_active_left.png" type="BINDATA" /> - <include name="IDR_TAB_ACTIVE_RIGHT" file="touch_100_percent/ash/tab_active_right.png" type="BINDATA" /> - <include name="IDR_TAB_ALPHA_LEFT" file="touch_100_percent/ash/tab_alpha_left.png" type="BINDATA" /> - <include name="IDR_TAB_ALPHA_RIGHT" file="touch_100_percent/ash/tab_alpha_right.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_TAB_ACTIVE_CENTER" file="default_100_percent/tab_active_center.png" type="BINDATA" /> - <include name="IDR_TAB_ACTIVE_LEFT" file="default_100_percent/tab_active_left.png" type="BINDATA" /> - <include name="IDR_TAB_ACTIVE_RIGHT" file="default_100_percent/tab_active_right.png" type="BINDATA" /> - <include name="IDR_TAB_ALPHA_LEFT" file="default_100_percent/tab_alpha_left.png" type="BINDATA" /> - <include name="IDR_TAB_ALPHA_RIGHT" file="default_100_percent/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="touch_100_percent/ash/tab_close_normal.png" type="BINDATA" /> - <include name="IDR_TAB_CLOSE_H" file="touch_100_percent/ash/tab_close_hover.png" type="BINDATA" /> - <include name="IDR_TAB_CLOSE_MASK" file="touch_100_percent/ash/tab_close_mask.png" type="BINDATA" /> - <include name="IDR_TAB_CLOSE_P" file="touch_100_percent/ash/tab_close_pressed.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_TAB_CLOSE" file="default_100_percent/tab_close.png" type="BINDATA" /> - <include name="IDR_TAB_CLOSE_H" file="default_100_percent/tab_close_hover.png" type="BINDATA" /> - <include name="IDR_TAB_CLOSE_MASK" file="default_100_percent/tab_close_mask.png" type="BINDATA" /> - <include name="IDR_TAB_CLOSE_P" file="default_100_percent/tab_close_pressed.png" type="BINDATA" /> - </if> - <include name="IDR_TAB_DROP_DOWN" file="touch_100_percent/tab_drop_down.png" type="BINDATA" /> - <include name="IDR_TAB_DROP_UP" file="touch_100_percent/tab_drop_up.png" type="BINDATA" /> - <if expr="pp_ifdef('toolkit_views')"> - <include name="IDR_TAB_INACTIVE_CENTER" file="touch_100_percent/ash/tab_inactive_center.png" type="BINDATA" /> - <include name="IDR_TAB_INACTIVE_LEFT" file="touch_100_percent/ash/tab_inactive_left.png" type="BINDATA" /> - <include name="IDR_TAB_INACTIVE_RIGHT" file="touch_100_percent/ash/tab_inactive_right.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_TAB_INACTIVE_CENTER" file="default_100_percent/tab_inactive_center.png" type="BINDATA" /> - <include name="IDR_TAB_INACTIVE_LEFT" file="default_100_percent/tab_inactive_left.png" type="BINDATA" /> - <include name="IDR_TAB_INACTIVE_RIGHT" file="default_100_percent/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="default_100_percent/ash/theme_frame_default_active.png" type="BINDATA" /> - <include name="IDR_THEME_FRAME_INACTIVE" file="default_100_percent/ash/theme_frame_default_inactive.png" type="BINDATA" /> - <include name="IDR_THEME_FRAME_INCOGNITO" file="default_100_percent/ash/theme_frame_incognito_active.png" type="BINDATA" /> - <include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="default_100_percent/ash/theme_frame_incognito_inactive.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('use_ash')"> - <include name="IDR_THEME_FRAME" file="default_100_percent/theme_frame.png" type="BINDATA" /> - <include name="IDR_THEME_FRAME_INACTIVE" file="default_100_percent/theme_frame_inactive.png" type="BINDATA" /> - <include name="IDR_THEME_FRAME_INCOGNITO" file="default_100_percent/theme_frame_incognito.png" type="BINDATA" /> - <include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="default_100_percent/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="default_100_percent/ash/theme_tab_background.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('use_ash')"> - <include name="IDR_THEME_TAB_BACKGROUND" file="default_100_percent/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="default_100_percent/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="touch_100_percent/theme_toolbar_default2.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('use_ash') and not is_macosx"> - <include name="IDR_THEME_TOOLBAR" file="default_100_percent/theme_toolbar_default.png" type="BINDATA" /> - </if> - <if expr="is_macosx"> - <!-- TODO(jamescook): Is this right? --> - <include name="IDR_THEME_TOOLBAR_INACTIVE" file="touch_100_percent/theme_toolbar_default_inactive2.png" type="BINDATA" /> - </if> - <include name="IDR_THROBBER_WAITING" file="default_100_percent/throbber_waiting.png" type="BINDATA" /> - <if expr="pp_ifdef('toolkit_views')"> - <include name="IDR_TOOLS" file="touch_100_percent/ash/browser_tools_normal.png" type="BINDATA" /> - <include name="IDR_TOOLS_H" file="touch_100_percent/ash/browser_tools_hover.png" type="BINDATA" /> - <include name="IDR_TOOLS_P" file="touch_100_percent/ash/browser_tools_pressed.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_TOOLS" file="default_100_percent/tools.png" type="BINDATA" /> - <include name="IDR_TOOLS_H" file="default_100_percent/tools_hover.png" type="BINDATA" /> - <include name="IDR_TOOLS_P" file="default_100_percent/tools_pressed.png" type="BINDATA" /> - </if> - <include name="IDR_ZOOM_MINUS" file="touch_100_percent/zoom_minus.png" type="BINDATA" /> - <include name="IDR_ZOOM_PLUS" file="touch_100_percent/zoom_plus.png" type="BINDATA" /> - </includes> - </release> -</grit> diff --git a/chrome/app/theme/theme_resources_touch_2x.grd b/chrome/app/theme/theme_resources_touch_2x.grd deleted file mode 100644 index 26a148d..0000000 --- a/chrome/app/theme/theme_resources_touch_2x.grd +++ /dev/null @@ -1,295 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<grit latest_public_release="0" current_release="1"> - <outputs> - <output filename="grit/theme_resources_touch_2x.h" type="rc_header"> - <emit emit_type='prepend'></emit> - </output> - <output filename="theme_resources_touch_2x.pak" type="data_package" /> - </outputs> - <release seq="1"> - <includes> - <!-- KEEP THESE IN ALPHABETICAL ORDER AND SYNCHRONIZED WITH - theme_resources_standard.grd. THIS MEANS THAT EACH ICON IN THIS FILE - MUST HAVE AN EQUIVALENT ICON IN THE OTHER FILE. - YOU MUST ALSO REPLICATE ALL IFDEFS. --> - <include name="IDR_APP_NOTIFICATION_NUB" file="default_100_percent/nub.png" type="BINDATA" /> - <include name="IDR_APP_NOTIFICATION_NUB_MASK" file="default_100_percent/nub_mask.png" type="BINDATA" /> - <include name="IDR_APP_NOTIFICATION_SMALL_BUBBLE" file="default_100_percent/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('toolkit_views')"> - <include name="IDR_BACK" file="touch_200_percent/ash/browser_back_normal.png" type="BINDATA" /> - <include name="IDR_BACK_D" file="touch_200_percent/ash/browser_back_disabled.png" type="BINDATA" /> - <include name="IDR_BACK_H" file="touch_200_percent/ash/browser_back_hover.png" type="BINDATA" /> - <include name="IDR_BACK_P" file="touch_200_percent/ash/browser_back_pressed.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_BACK" file="default_200_percent/back.png" type="BINDATA" /> - <include name="IDR_BACK_D" file="default_200_percent/back_disabled.png" type="BINDATA" /> - <include name="IDR_BACK_H" file="default_200_percent/back_hover.png" type="BINDATA" /> - <include name="IDR_BACK_P" file="default_200_percent/back_pressed.png" type="BINDATA" /> - </if> - <include name="IDR_BALLOON_WRENCH" file="touch_100_percent/notification_wrench.png" type="BINDATA" /> - <include name="IDR_BALLOON_WRENCH_H" file="touch_100_percent/notification_wrench_hover.png" type="BINDATA" /> - <include name="IDR_BALLOON_WRENCH_P" file="touch_100_percent/notification_wrench_pressed.png" type="BINDATA" /> - <include name="IDR_BLOCKED_COOKIES" file="touch_100_percent/blocked_cookies.png" type="BINDATA" /> - <include name="IDR_BLOCKED_IMAGES" file="touch_100_percent/blocked_images.png" type="BINDATA" /> - <include name="IDR_BLOCKED_JAVASCRIPT" file="touch_100_percent/blocked_script.png" type="BINDATA" /> - <include name="IDR_BLOCKED_PLUGINS" file="touch_100_percent/blocked_plugins.png" type="BINDATA" /> - <include name="IDR_BLOCKED_POPUPS" file="touch_100_percent/blocked_popups.png" type="BINDATA" /> - <include name="IDR_BOOKMARKS_FAVICON" file="touch_100_percent/bookmarks_favicon.png" type="BINDATA" /> - <if expr="pp_ifdef('toolkit_views')"> - <include name="IDR_BROWSER_ACTION" file="touch_200_percent/ash/browser_action_normal.png" type="BINDATA" /> - <include name="IDR_BROWSER_ACTION_H" file="touch_200_percent/ash/browser_action_hover.png" type="BINDATA" /> - <include name="IDR_BROWSER_ACTION_P" file="touch_200_percent/ash/browser_action_pressed.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_BROWSER_ACTION" file="default_200_percent/browser_action.png" type="BINDATA" /> - <include name="IDR_BROWSER_ACTION_H" file="default_200_percent/browser_action_hover.png" type="BINDATA" /> - <include name="IDR_BROWSER_ACTION_P" file="default_200_percent/browser_action_pressed.png" type="BINDATA" /> - </if> - <if expr="pp_ifdef('toolkit_views')"> - <include name="IDR_BROWSER_ACTIONS_OVERFLOW" file="touch_200_percent/ash/browser_actions_overflow_normal.png" type="BINDATA" /> - <include name="IDR_BROWSER_ACTIONS_OVERFLOW_H" file="touch_200_percent/ash/browser_actions_overflow_hover.png" type="BINDATA" /> - <include name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="touch_200_percent/ash/browser_actions_overflow_pressed.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_BROWSER_ACTIONS_OVERFLOW" file="default_200_percent/browser_actions_overflow.png" type="BINDATA" /> - <include name="IDR_BROWSER_ACTIONS_OVERFLOW_H" file="default_200_percent/browser_actions_overflow_hover.png" type="BINDATA" /> - <include name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="default_200_percent/browser_actions_overflow_pressed.png" type="BINDATA" /> - </if> - <if expr="is_win"> - <include name="IDR_CONFLICT_FAVICON" file="touch_100_percent/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="touch_100_percent/content_top_center_ash.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('use_ash')"> - <include name="IDR_CONTENT_TOP_CENTER" file="touch_100_percent/ash/content_top_center.png" type="BINDATA" /> - </if> - <include name="IDR_CONTENT_TOP_LEFT_CORNER" file="touch_100_percent/content_top_left_corner.png" type="BINDATA" /> - <include name="IDR_CONTENT_TOP_LEFT_CORNER_MASK" file="touch_100_percent/content_top_left_corner_mask.png" type="BINDATA" /> - <include name="IDR_CONTENT_TOP_RIGHT_CORNER" file="touch_100_percent/content_top_right_corner.png" type="BINDATA" /> - <include name="IDR_CONTENT_TOP_RIGHT_CORNER_MASK" file="touch_100_percent/content_top_right_corner_mask.png" type="BINDATA" /> - <include name="IDR_DOWNLOADS_FAVICON" file="touch_100_percent/downloads_favicon.png" type="BINDATA" /> - <include name="IDR_FEEDBACK" file="touch_100_percent/feedback.png" type="BINDATA" /> - <include name="IDR_FEEDBACK_H" file="touch_100_percent/feedback_hover.png" type="BINDATA" /> - <include name="IDR_FEEDBACK_P" file="touch_100_percent/feedback_pressed.png" type="BINDATA" /> - <include name="IDR_FLAGS" file="touch_100_percent/flags.png" type="BINDATA" /> - <if expr="pp_ifdef('toolkit_views')"> - <include name="IDR_FORWARD" file="touch_200_percent/ash/browser_forward_normal.png" type="BINDATA" /> - <include name="IDR_FORWARD_D" file="touch_200_percent/ash/browser_forward_disabled.png" type="BINDATA" /> - <include name="IDR_FORWARD_H" file="touch_200_percent/ash/browser_forward_hover.png" type="BINDATA" /> - <include name="IDR_FORWARD_P" file="touch_200_percent/ash/browser_forward_pressed.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_FORWARD" file="default_200_percent/forward.png" type="BINDATA" /> - <include name="IDR_FORWARD_D" file="default_200_percent/forward_disabled.png" type="BINDATA" /> - <include name="IDR_FORWARD_H" file="default_200_percent/forward_hover.png" type="BINDATA" /> - <include name="IDR_FORWARD_P" file="default_200_percent/forward_pressed.png" type="BINDATA" /> - </if> - <include name="IDR_GEOLOCATION_INFOBAR_ICON" file="touch_100_percent/infobar_geolocation.png" type="BINDATA" /> - <include name="IDR_HISTORY_FAVICON" file="touch_100_percent/history_favicon.png" type="BINDATA" /> - <if expr="pp_ifdef('toolkit_views')"> - <include name="IDR_HOME" file="touch_200_percent/ash/browser_home_normal.png" type="BINDATA" /> - <include name="IDR_HOME_H" file="touch_200_percent/ash/browser_home_hover.png" type="BINDATA" /> - <include name="IDR_HOME_P" file="touch_200_percent/ash/browser_home_pressed.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_HOME" file="default_200_percent/home.png" type="BINDATA" /> - <include name="IDR_HOME_H" file="default_200_percent/home_hover.png" type="BINDATA" /> - <include name="IDR_HOME_P" file="default_200_percent/home_pressed.png" type="BINDATA" /> - </if> - <include name="IDR_INFOBAR_ALT_NAV_URL" file="touch_100_percent/infobar_didyoumean.png" type="BINDATA" /> - <include name="IDR_INFOBAR_AUTOFILL" file="touch_100_percent/infobar_autofill.png" type="BINDATA" /> - <include name="IDR_INFOBAR_AUTOLOGIN" file="touch_100_percent/infobar_autologin.png" type="BINDATA" /> - <include name="IDR_INFOBAR_COOKIE" file="touch_100_percent/infobar_cookie.png" type="BINDATA" /> - <include name="IDR_INFOBAR_DESKTOP_NOTIFICATIONS" file="touch_100_percent/infobar_desktop_notifications.png" type="BINDATA" /> - <include name="IDR_INFOBAR_INCOMPLETE" file="touch_100_percent/infobar_incomplete.png" type="BINDATA" /> - <include name="IDR_INFOBAR_MEDIA_STREAM_CAMERA" file="touch_100_percent/infobar_camera.png" type="BINDATA" /> - <include name="IDR_INFOBAR_MEDIA_STREAM_MIC" file="touch_100_percent/infobar_microphone.png" type="BINDATA" /> - <include name="IDR_INFOBAR_MULTIPLE_DOWNLOADS" file="touch_100_percent/infobar_multiple_downloads.png" type="BINDATA" /> - <include name="IDR_INFOBAR_PLUGIN_CRASHED" file="touch_100_percent/infobar_plugin_crashed.png" type="BINDATA" /> - <include name="IDR_INFOBAR_PLUGIN_INSTALL" file="touch_100_percent/infobar_plugin.png" type="BINDATA" /> - <include name="IDR_INFOBAR_QUESTION_MARK" file="touch_100_percent/infobar_questionmark.png" type="BINDATA" /> - <include name="IDR_INFOBAR_RESTORE_SESSION" file="touch_100_percent/infobar_restore.png" type="BINDATA" /> - <include name="IDR_INFOBAR_SAVE_PASSWORD" file="touch_100_percent/infobar_savepassword.png" type="BINDATA" /> - <include name="IDR_INFOBAR_SSL_WARNING" file="touch_100_percent/infobar_insecure.png" type="BINDATA" /> - <include name="IDR_INFOBAR_SYNC" file="touch_100_percent/infobar_sync.png" type="BINDATA" /> - <include name="IDR_INFOBAR_THEME" file="touch_100_percent/infobar_theme.png" type="BINDATA" /> - <include name="IDR_INFOBAR_TRANSLATE" file="touch_100_percent/infobar_translate.png" type="BINDATA" /> - <include name="IDR_KEYWORD_SEARCH_MAGNIFIER" file="touch_100_percent/keyword_search_magnifier.png" type="BINDATA" /> - <if expr="pp_ifdef('toolkit_views')"> - <include name="IDR_LOCATIONBG_C" file="touch_200_percent/ash/browser_omnibox_middle.png" type="BINDATA" /> - <include name="IDR_LOCATIONBG_L" file="touch_200_percent/ash/browser_omnibox_left.png" type="BINDATA" /> - <include name="IDR_LOCATIONBG_R" file="touch_200_percent/ash/browser_omnibox_right.png" type="BINDATA" /> - <include name="IDR_LOCATION_BAR_BORDER" file="touch_100_percent/ash/browser_omnibox_border.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_LOCATIONBG_C" file="default_100_percent/omnibox_c.png" type="BINDATA" /> - <include name="IDR_LOCATIONBG_L" file="default_100_percent/omnibox_l.png" type="BINDATA" /> - <include name="IDR_LOCATIONBG_R" file="default_100_percent/omnibox_r.png" type="BINDATA" /> - <include name="IDR_LOCATION_BAR_BORDER" file="default_100_percent/omnibox_border.png" type="BINDATA" /> - </if> - <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_C" file="touch_100_percent/keyword_search_bubble_c.png" type="BINDATA" /> - <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_L" file="touch_100_percent/keyword_search_bubble_l.png" type="BINDATA" /> - <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_R" file="touch_100_percent/keyword_search_bubble_r.png" type="BINDATA" /> - <include name="IDR_MOBILE" file="touch_100_percent/mobile.png" type="BINDATA" /> - <include name="IDR_MOBILE_LIT" file="touch_100_percent/mobile_lit.png" type="BINDATA" /> - <if expr="pp_ifdef('use_ash')"> - <include name="IDR_NEWTAB_BUTTON" file="touch_100_percent/newtab_normal.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_H" file="touch_100_percent/newtab_hover.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_P" file="touch_100_percent/newtab_pressed.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_MASK" file="touch_100_percent/newtab_button_mask.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_PLUS" file="default_100_percent/newtab_views_plus.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_P_PLUS" file="default_100_percent/newtab_p_views_plus.png" type="BINDATA" /> - </if> - <if expr="pp_ifdef('toolkit_views') and not pp_ifdef('use_ash')"> - <include name="IDR_NEWTAB_BUTTON" file="touch_100_percent/newtab_normal.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_H" file="touch_100_percent/newtab_hover.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_P" file="touch_100_percent/newtab_pressed.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_MASK" file="touch_100_percent/newtab_button_mask.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_PLUS" file="default_100_percent/newtab_views_plus.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_P_PLUS" file="default_100_percent/newtab_p_views_plus.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('toolkit_views') and not pp_ifdef('use_ash')"> - <include name="IDR_NEWTAB_BUTTON" file="default_200_percent/newtab.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_H" file="default_200_percent/newtab_hover.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_P" file="default_200_percent/newtab_pressed.png" type="BINDATA" /> - <include name="IDR_NEWTAB_BUTTON_MASK" file="default_200_percent/newtab_button_mask.png" type="BINDATA" /> - </if> - <include name="IDR_SETTINGS_FAVICON" file="touch_100_percent/settings_favicon.png" type="BINDATA" /> - <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_C" file="touch_100_percent/ev_bubble_c.png" type="BINDATA" /> - <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_L" file="touch_100_percent/ev_bubble_l.png" type="BINDATA" /> - <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_R" file="touch_100_percent/ev_bubble_r.png" type="BINDATA" /> - <include name="IDR_OTR_ICON" file="touch_100_percent/otr_icon.png" type="BINDATA" /> - <include name="IDR_OTR_ICON_FULLSCREEN" file="touch_200_percent/otr_icon_fullscreen.png" type="BINDATA" /> - <include name="IDR_PLUGIN" file="touch_100_percent/plugin.png" type="BINDATA" /> - <if expr="pp_ifdef('toolkit_views')"> - <include name="IDR_RELOAD" file="touch_200_percent/ash/browser_reload_normal.png" type="BINDATA" /> - <include name="IDR_RELOAD_H" file="touch_200_percent/ash/browser_reload_hover.png" type="BINDATA" /> - <include name="IDR_RELOAD_P" file="touch_200_percent/ash/browser_reload_pressed.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_RELOAD" file="default_200_percent/reload.png" type="BINDATA" /> - <include name="IDR_RELOAD_H" file="default_200_percent/reload_hover.png" type="BINDATA" /> - <include name="IDR_RELOAD_P" file="default_200_percent/reload_pressed.png" type="BINDATA" /> - </if> - <include name="IDR_SAD_FAVICON" file="touch_100_percent/sadfavicon.png" type="BINDATA" /> - <include name="IDR_STAR" file="touch_100_percent/star.png" type="BINDATA" /> - <include name="IDR_STAR_LIT" file="touch_100_percent/star_lit.png" type="BINDATA" /> - <if expr="pp_ifdef('chromeos')"> - <include name="IDR_STATUSBAR_NETWORK_ARCS_DARK" file="default_200_percent/statusbar_network_arcs_dark.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_NETWORK_ARCS_LIGHT" file="default_200_percent/statusbar_network_arcs_light.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_NETWORK_BARS_DARK" file="default_200_percent/statusbar_network_bars_dark.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_NETWORK_BARS_LIGHT" file="default_200_percent/statusbar_network_bars_light.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_NETWORK_SECURE" file="default_200_percent/statusbar_network_secure.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_VPN" file="default_200_percent/statusbar_vpn_dark.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_WIRED" file="default_200_percent/statusbar_wired.png" type="BINDATA" /> - </if> - <include name="IDR_ACTION_BOX_BUTTON" file="default_100_percent/action_box_button.png" type="BINDATA" /> - <if expr="pp_ifdef('toolkit_views')"> - <include name="IDR_STOP" file="touch_200_percent/ash/browser_stop_normal.png" type="BINDATA" /> - <include name="IDR_STOP_D" file="touch_200_percent/ash/browser_stop_disabled.png" type="BINDATA" /> - <include name="IDR_STOP_H" file="touch_200_percent/ash/browser_stop_hover.png" type="BINDATA" /> - <include name="IDR_STOP_P" file="touch_200_percent/ash/browser_stop_pressed.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_STOP" file="default_200_percent/stop.png" type="BINDATA" /> - <include name="IDR_STOP_D" file="default_100_percent/stop_disabled.png" type="BINDATA" /> - <include name="IDR_STOP_H" file="default_200_percent/stop_hover.png" type="BINDATA" /> - <include name="IDR_STOP_P" file="default_200_percent/stop_pressed.png" type="BINDATA" /> - </if> - <if expr="pp_ifdef('toolkit_views')"> - <include name="IDR_TAB_ACTIVE_CENTER" file="touch_100_percent/ash/tab_active_center.png" type="BINDATA" /> - <include name="IDR_TAB_ACTIVE_LEFT" file="touch_100_percent/ash/tab_active_left.png" type="BINDATA" /> - <include name="IDR_TAB_ACTIVE_RIGHT" file="touch_100_percent/ash/tab_active_right.png" type="BINDATA" /> - <include name="IDR_TAB_ALPHA_LEFT" file="touch_100_percent/ash/tab_alpha_left.png" type="BINDATA" /> - <include name="IDR_TAB_ALPHA_RIGHT" file="touch_100_percent/ash/tab_alpha_right.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_TAB_ACTIVE_CENTER" file="default_100_percent/tab_active_center.png" type="BINDATA" /> - <include name="IDR_TAB_ACTIVE_LEFT" file="default_100_percent/tab_active_left.png" type="BINDATA" /> - <include name="IDR_TAB_ACTIVE_RIGHT" file="default_100_percent/tab_active_right.png" type="BINDATA" /> - <include name="IDR_TAB_ALPHA_LEFT" file="default_100_percent/tab_alpha_left.png" type="BINDATA" /> - <include name="IDR_TAB_ALPHA_RIGHT" file="default_100_percent/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="touch_200_percent/ash/tab_close_normal.png" type="BINDATA" /> - <include name="IDR_TAB_CLOSE_H" file="touch_200_percent/ash/tab_close_hover.png" type="BINDATA" /> - <include name="IDR_TAB_CLOSE_MASK" file="touch_200_percent/ash/tab_close_mask.png" type="BINDATA" /> - <include name="IDR_TAB_CLOSE_P" file="touch_200_percent/ash/tab_close_pressed.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_TAB_CLOSE" file="default_100_percent/tab_close.png" type="BINDATA" /> - <include name="IDR_TAB_CLOSE_H" file="default_100_percent/tab_close_hover.png" type="BINDATA" /> - <include name="IDR_TAB_CLOSE_MASK" file="default_100_percent/tab_close_mask.png" type="BINDATA" /> - <include name="IDR_TAB_CLOSE_P" file="default_100_percent/tab_close_pressed.png" type="BINDATA" /> - </if> - <include name="IDR_TAB_DROP_DOWN" file="touch_100_percent/tab_drop_down.png" type="BINDATA" /> - <include name="IDR_TAB_DROP_UP" file="touch_100_percent/tab_drop_up.png" type="BINDATA" /> - <if expr="pp_ifdef('toolkit_views')"> - <include name="IDR_TAB_INACTIVE_CENTER" file="touch_100_percent/ash/tab_inactive_center.png" type="BINDATA" /> - <include name="IDR_TAB_INACTIVE_LEFT" file="touch_100_percent/ash/tab_inactive_left.png" type="BINDATA" /> - <include name="IDR_TAB_INACTIVE_RIGHT" file="touch_100_percent/ash/tab_inactive_right.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_TAB_INACTIVE_CENTER" file="default_100_percent/tab_inactive_center.png" type="BINDATA" /> - <include name="IDR_TAB_INACTIVE_LEFT" file="default_100_percent/tab_inactive_left.png" type="BINDATA" /> - <include name="IDR_TAB_INACTIVE_RIGHT" file="default_100_percent/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="default_100_percent/ash/theme_frame_default_active.png" type="BINDATA" /> - <include name="IDR_THEME_FRAME_INACTIVE" file="default_100_percent/ash/theme_frame_default_inactive.png" type="BINDATA" /> - <include name="IDR_THEME_FRAME_INCOGNITO" file="default_100_percent/ash/theme_frame_incognito_active.png" type="BINDATA" /> - <include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="default_100_percent/ash/theme_frame_incognito_inactive.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('use_ash')"> - <include name="IDR_THEME_FRAME" file="default_100_percent/theme_frame.png" type="BINDATA" /> - <include name="IDR_THEME_FRAME_INACTIVE" file="default_100_percent/theme_frame_inactive.png" type="BINDATA" /> - <include name="IDR_THEME_FRAME_INCOGNITO" file="default_100_percent/theme_frame_incognito.png" type="BINDATA" /> - <include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="default_100_percent/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="default_100_percent/ash/theme_tab_background.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('use_ash')"> - <include name="IDR_THEME_TAB_BACKGROUND" file="default_100_percent/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="default_100_percent/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="touch_100_percent/theme_toolbar_default2.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('use_ash') and not is_macosx"> - <include name="IDR_THEME_TOOLBAR" file="default_100_percent/theme_toolbar_default.png" type="BINDATA" /> - </if> - <if expr="is_macosx"> - <!-- TODO(jamescook): Is this right? --> - <include name="IDR_THEME_TOOLBAR_INACTIVE" file="touch_100_percent/theme_toolbar_default_inactive2.png" type="BINDATA" /> - </if> - <include name="IDR_THROBBER_WAITING" file="default_200_percent/throbber_waiting.png" type="BINDATA" /> - <if expr="pp_ifdef('toolkit_views')"> - <include name="IDR_TOOLS" file="touch_200_percent/ash/browser_tools_normal.png" type="BINDATA" /> - <include name="IDR_TOOLS_H" file="touch_200_percent/ash/browser_tools_hover.png" type="BINDATA" /> - <include name="IDR_TOOLS_P" file="touch_200_percent/ash/browser_tools_pressed.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('toolkit_views')"> - <include name="IDR_TOOLS" file="default_200_percent/tools.png" type="BINDATA" /> - <include name="IDR_TOOLS_H" file="default_200_percent/tools_hover.png" type="BINDATA" /> - <include name="IDR_TOOLS_P" file="default_200_percent/tools_pressed.png" type="BINDATA" /> - </if> - <include name="IDR_ZOOM_MINUS" file="touch_200_percent/zoom_minus.png" type="BINDATA" /> - <include name="IDR_ZOOM_PLUS" file="touch_200_percent/zoom_plus.png" type="BINDATA" /> - </includes> - </release> -</grit> diff --git a/chrome/browser/ui/libgtk2ui/libgtk2ui.gyp b/chrome/browser/ui/libgtk2ui/libgtk2ui.gyp index ed1a5c7..866fca7 100644 --- a/chrome/browser/ui/libgtk2ui/libgtk2ui.gyp +++ b/chrome/browser/ui/libgtk2ui/libgtk2ui.gyp @@ -17,7 +17,6 @@ '../../../../skia/skia.gyp:skia', '../../../../ui/ui.gyp:ui', '../../../../ui/ui.gyp:ui_resources', - '../../../../ui/ui.gyp:ui_resources_2x', '../../../../ui/ui.gyp:ui_resources_standard', '../../../chrome_resources.gyp:chrome_extra_resources', '../../../chrome_resources.gyp:chrome_resources', diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 1590f8c..0284a06 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -61,7 +61,6 @@ '../ui/surface/surface.gyp:surface', '../ui/ui.gyp:ui', '../ui/ui.gyp:ui_resources', - '../ui/ui.gyp:ui_resources_2x', '../ui/ui.gyp:ui_resources_standard', '../ui/web_dialogs/web_dialogs.gyp:web_dialogs', '../v8/tools/gyp/v8.gyp:v8', diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi index 70d3332..d4b3e28 100644 --- a/chrome/chrome_browser_extensions.gypi +++ b/chrome/chrome_browser_extensions.gypi @@ -35,7 +35,6 @@ '../ui/base/strings/ui_strings.gyp:ui_strings', '../ui/ui.gyp:ui', '../ui/ui.gyp:ui_resources', - '../ui/ui.gyp:ui_resources_2x', '../ui/ui.gyp:ui_resources_standard', '../webkit/support/webkit_support.gyp:appcache', '../webkit/support/webkit_support.gyp:blob', diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index f5d3cde..ed2615f 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -545,7 +545,7 @@ ['enable_hidpi==1', { 'mac_bundle_resources': [ '<(grit_out_dir)/theme_resources_2x.pak', - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_2x/ui_resources_2x.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_2x.pak', ], }], ], # conditions diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp index 89538e1..505949d 100644 --- a/chrome/chrome_resources.gyp +++ b/chrome/chrome_resources.gyp @@ -212,33 +212,12 @@ 'includes': [ '../build/grit_action.gypi' ], }, { - 'action_name': 'theme_resources_2x', - 'variables': { - 'grit_grd_file': 'app/theme/theme_resources_2x.grd', - }, - 'includes': [ '../build/grit_action.gypi' ], - }, - { 'action_name': 'theme_resources_standard', 'variables': { 'grit_grd_file': 'app/theme/theme_resources_standard.grd', }, 'includes': [ '../build/grit_action.gypi' ], }, - { - 'action_name': 'theme_resources_touch_1x', - 'variables': { - 'grit_grd_file': 'app/theme/theme_resources_touch_1x.grd', - }, - 'includes': [ '../build/grit_action.gypi' ], - }, - { - 'action_name': 'theme_resources_touch_2x', - 'variables': { - 'grit_grd_file': 'app/theme/theme_resources_touch_2x.grd', - }, - 'includes': [ '../build/grit_action.gypi' ], - }, ], 'includes': [ '../build/grit_target.gypi' ], }, @@ -247,10 +226,7 @@ 'type': 'none', 'dependencies': [ 'theme_resources_gen', - '<(DEPTH)/ui/ui.gyp:ui_resources_2x', '<(DEPTH)/ui/ui.gyp:ui_resources_standard', - '<(DEPTH)/ui/ui.gyp:ui_resources_touch', - '<(DEPTH)/ui/ui.gyp:ui_resources_touch_2x', ], 'conditions': [ ['OS != "mac"', { @@ -279,7 +255,7 @@ 'destination': '<(PRODUCT_DIR)', 'files': [ '<(grit_out_dir)/theme_resources_2x.pak', - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_2x/ui_resources_2x.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_2x.pak', ], }, ], @@ -291,8 +267,8 @@ 'files': [ '<(grit_out_dir)/theme_resources_touch_1x.pak', '<(grit_out_dir)/theme_resources_touch_2x.pak', - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_touch/ui_resources_touch.pak', - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_touch_2x/ui_resources_touch_2x.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_touch.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_touch_2x.pak', ], }, ], diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids index 1933a66..9151c9f 100644 --- a/tools/gritsettings/resource_ids +++ b/tools/gritsettings/resource_ids @@ -145,18 +145,8 @@ "devtools_resources.grd": { "includes": [20500], }, - # All standard and large theme resources should have the same IDs. "chrome/app/theme/theme_resources_standard.grd": { - "includes": [21000], - }, - "chrome/app/theme/theme_resources_2x.grd": { - "includes": [21000], - }, - "chrome/app/theme/theme_resources_touch_1x.grd": { - "includes": [21000], - }, - "chrome/app/theme/theme_resources_touch_2x.grd": { - "includes": [21000], + "structures": [21000], }, # This file is generated during the build. "chrome/browser/debugger/frontend/devtools_discovery_page_resources.grd": { @@ -174,18 +164,8 @@ "chrome/browser/resources/quota_internals_resources.grd": { "includes": [23000], }, - # All standard and large theme resources should have the same IDs. "ui/resources/ui_resources_standard.grd": { - "includes": [24000], - }, - "ui/resources/ui_resources_touch.grd": { - "includes": [24000], - }, - "ui/resources/ui_resources_touch_2x.grd": { - "includes": [24000], - }, - "ui/resources/ui_resources_2x.grd": { - "includes": [24000], + "structures": [24000], }, "content/content_resources.grd": { "includes": [24500], diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp index 9581844..ff85629 100644 --- a/ui/aura/aura.gyp +++ b/ui/aura/aura.gyp @@ -18,7 +18,6 @@ '../compositor/compositor.gyp:compositor', '../ui.gyp:ui', '../ui.gyp:ui_resources', - '../ui.gyp:ui_resources_2x', '../ui.gyp:ui_resources_standard', ], 'defines': [ diff --git a/ui/resources/ui_resources_2x.grd b/ui/resources/ui_resources_2x.grd deleted file mode 100644 index 5d16361a..0000000 --- a/ui/resources/ui_resources_2x.grd +++ /dev/null @@ -1,233 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<grit latest_public_release="0" current_release="1"> - <outputs> - <output filename="grit/ui_resources_2x.h" type="rc_header"> - <emit emit_type='prepend'></emit> - </output> - <output filename="grit/ui_resources_2x_map.cc" type="resource_map_source" /> - <output filename="grit/ui_resources_2x_map.h" type="resource_map_header" /> - <output filename="ui_resources_2x.pak" type="data_package" /> - <output filename="ui_resources_2x.rc" type="rc_all" /> - </outputs> - <release seq="1"> - <includes> - <!-- KEEP THESE IN ALPHABETICAL ORDER AND SYNCHRONIZED WITH - ui_resources_standard.grd and ui_resources_touch.grd. THIS MEANS THAT - EACH ICON IN THIS FILE MUST HAVE AN EQUIVALENT ICON IN THE OTHER - FILES. --> - <include name="IDR_BUBBLE_B" file="default_200_percent/bubble_b.png" type="BINDATA" /> - <include name="IDR_BUBBLE_BL" file="default_200_percent/bubble_bl.png" type="BINDATA" /> - <include name="IDR_BUBBLE_BR" file="default_200_percent/bubble_br.png" type="BINDATA" /> - <include name="IDR_BUBBLE_B_ARROW" file="default_200_percent/bubble_pointer_b.png" type="BINDATA" /> - <include name="IDR_BUBBLE_L" file="default_200_percent/bubble_l.png" type="BINDATA" /> - <include name="IDR_BUBBLE_L_ARROW" file="default_200_percent/bubble_pointer_l.png" type="BINDATA" /> - <include name="IDR_BUBBLE_R" file="default_200_percent/bubble_r.png" type="BINDATA" /> - <include name="IDR_BUBBLE_R_ARROW" file="default_200_percent/bubble_pointer_r.png" type="BINDATA" /> - <include name="IDR_BUBBLE_T" file="default_200_percent/bubble_t.png" type="BINDATA" /> - <include name="IDR_BUBBLE_TL" file="default_200_percent/bubble_tl.png" type="BINDATA" /> - <include name="IDR_BUBBLE_TR" file="default_200_percent/bubble_tr.png" type="BINDATA" /> - <include name="IDR_BUBBLE_T_ARROW" file="default_200_percent/bubble_pointer_t.png" type="BINDATA" /> - - <include name="IDR_BUBBLE_SHADOW_B" file="default_100_percent/bubble_shadow_b.png" type="BINDATA" /> - <include name="IDR_BUBBLE_SHADOW_BL" file="default_100_percent/bubble_shadow_bl.png" type="BINDATA" /> - <include name="IDR_BUBBLE_SHADOW_BR" file="default_100_percent/bubble_shadow_br.png" type="BINDATA" /> - <include name="IDR_BUBBLE_SHADOW_L" file="default_100_percent/bubble_shadow_l.png" type="BINDATA" /> - <include name="IDR_BUBBLE_SHADOW_R" file="default_100_percent/bubble_shadow_r.png" type="BINDATA" /> - <include name="IDR_BUBBLE_SHADOW_T" file="default_100_percent/bubble_shadow_t.png" type="BINDATA" /> - <include name="IDR_BUBBLE_SHADOW_TL" file="default_100_percent/bubble_shadow_tl.png" type="BINDATA" /> - <include name="IDR_BUBBLE_SHADOW_TR" file="default_100_percent/bubble_shadow_tr.png" type="BINDATA" /> - - <include name="IDR_CLOSE_BAR" file="default_200_percent/close_bar.png" type="BINDATA" /> - <include name="IDR_CLOSE_BAR_H" file="default_200_percent/close_bar_hover.png" type="BINDATA" /> - <include name="IDR_CLOSE_BAR_MASK" file="default_200_percent/close_bar_mask.png" type="BINDATA" /> - <include name="IDR_CLOSE_BAR_P" file="default_200_percent/close_bar_pressed.png" type="BINDATA" /> - <include name="IDR_THROBBER" file="default_200_percent/throbber.png" type="BINDATA" /> - - <!-- Remaining images only used by Aura. --> - <!-- TODO(flackr): These are 1x assets, we have to replace these before - attempting to use them at 2x where they will be rendered as half - the intended size. --> - <if expr="pp_ifdef('use_aura')"> - <include name="IDR_AURA_WINDOW_BUTTON_SEPARATOR" file="default_100_percent/aura/window_button_separator.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_CLOSE" file="default_100_percent/aura/window_close_normal.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_CLOSE_H" file="default_100_percent/aura/window_close_hover.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_CLOSE_P" file="default_100_percent/aura/window_close_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE" file="default_100_percent/aura/window_fullscreen_close_normal.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE_H" file="default_100_percent/aura/window_fullscreen_close_hover.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE_P" file="default_100_percent/aura/window_fullscreen_close_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE" file="default_100_percent/aura/window_fullscreen_restore_normal.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE_H" file="default_100_percent/aura/window_fullscreen_restore_hover.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE_P" file="default_100_percent/aura/window_fullscreen_restore_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_FULLSCREEN_SEPARATOR" file="default_100_percent/aura/window_fullscreen_separator.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZE" file="default_100_percent/aura/window_maximize_normal.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZE_H" file="default_100_percent/aura/window_maximize_hover.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZE_P" file="default_100_percent/aura/window_maximize_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE" file="default_100_percent/aura/window_maximized_close_normal.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE_H" file="default_100_percent/aura/window_maximized_close_hover.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE_P" file="default_100_percent/aura/window_maximized_close_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE" file="default_100_percent/aura/window_maximized_minimize_normal.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE_H" file="default_100_percent/aura/window_maximized_minimize_hover.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE_P" file="default_100_percent/aura/window_maximized_minimize_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_LEFT_P" file="default_100_percent/aura/window_maximized_snap_left_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_MINIMIZE_P" file="default_100_percent/aura/window_maximized_snap_minimize_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_P" file="default_100_percent/aura/window_maximized_snap_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_RIGHT_P" file="default_100_percent/aura/window_maximized_snap_right_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE" file="default_100_percent/aura/window_maximized_restore_normal.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE_H" file="default_100_percent/aura/window_maximized_restore_hover.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE_P" file="default_100_percent/aura/window_maximized_restore_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_SNAP_LEFT_P" file="default_100_percent/aura/window_snap_left_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_SNAP_MINIMIZE_P" file="default_100_percent/aura/window_snap_minimize_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_SNAP_P" file="default_100_percent/aura/window_snap_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_SNAP_RIGHT_P" file="default_100_percent/aura/window_snap_right_pressed.png" type="BINDATA" /> - <!-- cursors --> - <include name="IDR_AURA_CURSOR_PTR" file="default_200_percent/aura/left_ptr.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_NO_DROP" file="default_200_percent/aura/nodrop.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_COPY" file="default_200_percent/aura/copy.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_HAND" file="default_200_percent/aura/hand2.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_FLEUR" file="default_200_percent/aura/fleur.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_IBEAM" file="default_200_percent/aura/xterm.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_NORTH_WEST_RESIZE" file="default_200_percent/aura/top_left_corner.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_SOUTH_EAST_RESIZE" file="default_200_percent/aura/top_left_corner.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_NORTH_EAST_RESIZE" file="default_200_percent/aura/top_right_corner.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_SOUTH_WEST_RESIZE" file="default_200_percent/aura/top_right_corner.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_NORTH_RESIZE" file="default_200_percent/aura/sb_v_double_arrow.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_EAST_RESIZE" file="default_200_percent/aura/sb_h_double_arrow.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_SOUTH_RESIZE" file="default_200_percent/aura/sb_v_double_arrow.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_WEST_RESIZE" file="default_200_percent/aura/sb_h_double_arrow.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_ALIAS" file="default_200_percent/aura/alias.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_CELL" file="default_200_percent/aura/cell.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_CONTEXT_MENU" file="default_200_percent/aura/context_menu.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_CROSSHAIR" file="default_200_percent/aura/crosshair.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_HELP" file="default_200_percent/aura/help.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_MOVE" file="default_200_percent/aura/move.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_XTERM_HORIZ" file="default_200_percent/aura/xterm_horiz.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_ZOOM_IN" file="default_200_percent/aura/zoom_in.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_ZOOM_OUT" file="default_200_percent/aura/zoom_out.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_ROW_RESIZE" file="default_200_percent/aura/sb_v_double_arrow.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_COL_RESIZE" file="default_200_percent/aura/sb_h_double_arrow.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_NORTH_WEST_SOUTH_EAST_RESIZE" file="default_200_percent/aura/top_left_corner.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_NORTH_EAST_SOUTH_WEST_RESIZE" file="default_200_percent/aura/top_right_corner.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_NORTH_SOUTH_RESIZE" file="default_200_percent/aura/sb_v_double_arrow.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_EAST_WEST_RESIZE" file="default_200_percent/aura/sb_h_double_arrow.png" type="BINDATA" /> - <!-- uber-tray --> - <include name="IDR_AURA_UBER_TRAY_VOLUME_LEVELS" file="default_100_percent/ash/status_volume_all.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_VOLUME_MUTE" file="default_200_percent/ash/status_volume_mute.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_BRIGHTNESS" file="default_200_percent/ash/status_brightness.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_SETTINGS" file="default_200_percent/ash/status_settings.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_POWER_SMALL" file="default_200_percent/ash/status_power_small_all.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_POWER_SMALL_DARK" file="default_200_percent/ash/status_power_small_all_dark.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_NETWORK_AIRPLANE" file="default_100_percent/ash/status_network_airplane.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_NETWORK_INFO" file="default_200_percent/ash/status_network_info.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_NETWORK_INFO_HOVER" file="default_200_percent/ash/status_network_info_h.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_NETWORK_FAILED" file="default_100_percent/ash/status_network_failed.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_NETWORK_DATA_LOW" file="default_100_percent/ash/status_data_low.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_NETWORK_DATA_NONE" file="default_100_percent/ash/status_data_none.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_SMS" file="default_100_percent/ash/status_sms.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_MORE" file="default_200_percent/ash/status_more.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_LESS" file="default_200_percent/ash/status_less.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_ACCESSIBILITY" file="default_100_percent/ash/status_accessibility_mode.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_ACCESSIBILITY_DARK" file="default_200_percent/ash/status_accessibility_dark.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_CAPS_LOCK" file="default_200_percent/ash/status_capslock.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_CAPS_LOCK_DARK" file="default_200_percent/ash/status_capslock_dark.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_BLUETOOTH" file="default_200_percent/ash/status_bluetooth.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_DRIVE" file="default_100_percent/ash/status_drive.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_DRIVE_FAILED" file="default_100_percent/ash/status_drive_item_failed.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_DRIVE_DONE" file="default_100_percent/ash/status_drive_item_done.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_DRIVE_CANCEL" file="default_100_percent/ash/status_drive_item_cancel.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_DRIVE_CANCEL_HOVER" file="default_100_percent/ash/status_drive_item_cancel_hover.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_DRIVE_LIGHT" file="default_100_percent/ash/status_drive_light.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_IME" file="default_200_percent/ash/status_ime.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_UPDATE" file="default_200_percent/ash/status_update.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_UPDATE_DARK" file="default_200_percent/ash/status_update_dark.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_WIFI_ENABLED" file="default_200_percent/ash/status_wifi_enabled.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_WIFI_ENABLED_HOVER" file="default_200_percent/ash/status_wifi_enabled_h.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_WIFI_DISABLED" file="default_200_percent/ash/status_wifi_disabled.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_WIFI_DISABLED_HOVER" file="default_200_percent/ash/status_wifi_disabled_h.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_CELLULAR_ENABLED" file="default_200_percent/ash/status_cellular_enabled.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_CELLULAR_ENABLED_HOVER" file="default_200_percent/ash/status_cellular_enabled_h.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_CELLULAR_DISABLED" file="default_200_percent/ash/status_cellular_disabled.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_CELLULAR_DISABLED_HOVER" file="default_200_percent/ash/status_cellular_disabled_h.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED" file="default_200_percent/ash/status_bluetooth_enabled.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED_HOVER" file="default_200_percent/ash/status_bluetooth_enabled_h.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED" file="default_200_percent/ash/status_bluetooth_disabled.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED_HOVER" file="default_200_percent/ash/status_bluetooth_disabled_h.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_SHUTDOWN" file="default_200_percent/ash/status_shutdown.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_SHUTDOWN_HOVER" file="default_200_percent/ash/status_shutdown_h.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_LOCKSCREEN" file="default_200_percent/ash/status_lockscreen.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_LOCKSCREEN_HOVER" file="default_200_percent/ash/status_lockscreen_h.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_HELP" file="default_200_percent/ash/status_help.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_HELP_HOVER" file="default_200_percent/ash/status_help_h.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_LOCALE" file="default_100_percent/ash/status_locale.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_WEB_NOTIFICATON" file="default_200_percent/ash/statusbar_notifications.png" type="BINDATA" /> - </if> - - <if expr="is_posix and not is_macosx and not pp_ifdef('use_aura')"> - <include name="IDR_CHECKBOX_DISABLED_INDETERMINATE" file="default_100_percent/linux-checkbox-disabled-indeterminate.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_DISABLED_OFF" file="default_100_percent/linux-checkbox-disabled-off.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_DISABLED_ON" file="default_100_percent/linux-checkbox-disabled-on.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_INDETERMINATE" file="default_100_percent/linux-checkbox-indeterminate.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_OFF" file="default_100_percent/linux-checkbox-off.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_ON" file="default_100_percent/linux-checkbox-on.png" type="BINDATA" /> - <include name="IDR_RADIO_DISABLED_OFF" file="default_100_percent/linux-radio-disabled-off.png" type="BINDATA" /> - <include name="IDR_RADIO_DISABLED_ON" file="default_100_percent/linux-radio-disabled-on.png" type="BINDATA" /> - <include name="IDR_RADIO_OFF" file="default_100_percent/linux-radio-off.png" type="BINDATA" /> - <include name="IDR_RADIO_ON" file="default_100_percent/linux-radio-on.png" type="BINDATA" /> - <include name="IDR_PROGRESS_BAR" file="default_100_percent/linux-progress-bar.png" type="BINDATA" /> - <include name="IDR_PROGRESS_BORDER_LEFT" file="default_100_percent/linux-progress-border-left.png" type="BINDATA" /> - <include name="IDR_PROGRESS_BORDER_RIGHT" file="default_100_percent/linux-progress-border-right.png" type="BINDATA" /> - <include name="IDR_PROGRESS_VALUE" file="default_100_percent/linux-progress-value.png" type="BINDATA" /> - </if> - - <!-- TODO(jamescook): Replace Linux images with Aura-specific ones. --> - <if expr="pp_ifdef('use_aura')"> - <include name="IDR_CHECKBOX_DISABLED_INDETERMINATE" file="default_100_percent/linux-checkbox-disabled-indeterminate.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_DISABLED_OFF" file="default_100_percent/linux-checkbox-disabled-off.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_DISABLED_ON" file="default_100_percent/linux-checkbox-disabled-on.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_INDETERMINATE" file="default_100_percent/linux-checkbox-indeterminate.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_OFF" file="default_100_percent/linux-checkbox-off.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_ON" file="default_100_percent/linux-checkbox-on.png" type="BINDATA" /> - <include name="IDR_RADIO_DISABLED_OFF" file="default_100_percent/linux-radio-disabled-off.png" type="BINDATA" /> - <include name="IDR_RADIO_DISABLED_ON" file="default_100_percent/linux-radio-disabled-on.png" type="BINDATA" /> - <include name="IDR_RADIO_OFF" file="default_100_percent/linux-radio-off.png" type="BINDATA" /> - <include name="IDR_RADIO_ON" file="default_100_percent/linux-radio-on.png" type="BINDATA" /> - <include name="IDR_PROGRESS_BAR" file="default_100_percent/linux-progress-bar.png" type="BINDATA" /> - <include name="IDR_PROGRESS_BORDER_LEFT" file="default_100_percent/linux-progress-border-left.png" type="BINDATA" /> - <include name="IDR_PROGRESS_BORDER_RIGHT" file="default_100_percent/linux-progress-border-right.png" type="BINDATA" /> - <include name="IDR_PROGRESS_VALUE" file="default_100_percent/linux-progress-value.png" type="BINDATA" /> - - <include name="IDR_SCROLL_BASE_CORNER" file="default_100_percent/scrollbar_base_normal_edge.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_CORNER_H" file="default_100_percent/scrollbar_base_hover_edge.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_HORIZONTAL_CENTER" file="default_100_percent/scrollbar_base_horizontal_normal_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_HORIZONTAL_CENTER_H" file="default_100_percent/scrollbar_base_horizontal_hover_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_HORIZONTAL_LEFT" file="default_100_percent/scrollbar_base_horizontal_normal_left.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_HORIZONTAL_LEFT_H" file="default_100_percent/scrollbar_base_horizontal_hover_left.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_HORIZONTAL_RIGHT" file="default_100_percent/scrollbar_base_horizontal_normal_right.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_HORIZONTAL_RIGHT_H" file="default_100_percent/scrollbar_base_horizontal_hover_right.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_VERTICAL_BOTTOM" file="default_100_percent/scrollbar_base_vertical_normal_bottom.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_VERTICAL_BOTTOM_H" file="default_100_percent/scrollbar_base_vertical_hover_bottom.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_VERTICAL_CENTER" file="default_100_percent/scrollbar_base_vertical_normal_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_VERTICAL_CENTER_H" file="default_100_percent/scrollbar_base_vertical_hover_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_VERTICAL_TOP" file="default_100_percent/scrollbar_base_vertical_normal_top.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_VERTICAL_TOP_H" file="default_100_percent/scrollbar_base_vertical_hover_top.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_HORIZONTAL_CENTER" file="default_100_percent/scrollbar_thumb_horizontal_normal_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_HORIZONTAL_CENTER_H" file="default_100_percent/scrollbar_thumb_horizontal_hover_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_HORIZONTAL_CENTER_P" file="default_100_percent/scrollbar_thumb_horizontal_pressed_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_HORIZONTAL_LEFT" file="default_100_percent/scrollbar_thumb_horizontal_normal_left.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_HORIZONTAL_LEFT_H" file="default_100_percent/scrollbar_thumb_horizontal_hover_left.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_HORIZONTAL_LEFT_P" file="default_100_percent/scrollbar_thumb_horizontal_pressed_left.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_HORIZONTAL_RIGHT" file="default_100_percent/scrollbar_thumb_horizontal_normal_right.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_HORIZONTAL_RIGHT_H" file="default_100_percent/scrollbar_thumb_horizontal_hover_right.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_HORIZONTAL_RIGHT_P" file="default_100_percent/scrollbar_thumb_horizontal_pressed_right.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_VERTICAL_BOTTOM" file="default_100_percent/scrollbar_thumb_vertical_normal_bottom.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_VERTICAL_BOTTOM_H" file="default_100_percent/scrollbar_thumb_vertical_hover_bottom.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_VERTICAL_BOTTOM_P" file="default_100_percent/scrollbar_thumb_vertical_pressed_bottom.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_VERTICAL_CENTER" file="default_100_percent/scrollbar_thumb_vertical_normal_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_VERTICAL_CENTER_H" file="default_100_percent/scrollbar_thumb_vertical_hover_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_VERTICAL_CENTER_P" file="default_100_percent/scrollbar_thumb_vertical_pressed_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_VERTICAL_TOP" file="default_100_percent/scrollbar_thumb_vertical_normal_top.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_VERTICAL_TOP_H" file="default_100_percent/scrollbar_thumb_vertical_hover_top.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_VERTICAL_TOP_P" file="default_100_percent/scrollbar_thumb_vertical_pressed_top.png" type="BINDATA" /> - </if> - </includes> - </release> -</grit> diff --git a/ui/resources/ui_resources_standard.grd b/ui/resources/ui_resources_standard.grd index 2b964d4..633f98d 100644 --- a/ui/resources/ui_resources_standard.grd +++ b/ui/resources/ui_resources_standard.grd @@ -1,233 +1,267 @@ <?xml version="1.0" encoding="UTF-8"?> <grit latest_public_release="0" current_release="1"> <outputs> - <output filename="grit/ui_resources_standard.h" type="rc_header"> + <output filename="grit/ui_resources_standard.h" type="rc_header" context="default_100_percent"> <emit emit_type='prepend'></emit> </output> - <output filename="grit/ui_resources_standard_map.cc" type="resource_map_source" /> - <output filename="grit/ui_resources_standard_map.h" type="resource_map_header" /> + <output filename="grit/ui_resources_standard_map.cc" type="resource_map_source" context="default_100_percent" /> + <output filename="grit/ui_resources_standard_map.h" type="resource_map_header" context="default_100_percent" /> <!-- TODO(oshima): Remove gfx_resources.pak once DumpRenderTree.gyp is updated. --> - <output filename="gfx_resources.pak" type="data_package" /> - <output filename="ui_resources_standard.pak" type="data_package" /> - <output filename="ui_resources_standard.rc" type="rc_all" /> + <output filename="gfx_resources.pak" type="data_package" context="default_100_percent" /> + <output filename="ui_resources_standard.pak" type="data_package" context="default_100_percent" /> + <output filename="ui_resources_2x.pak" type="data_package" context="default_200_percent" /> + <output filename="ui_resources_touch.pak" type="data_package" context="touch_100_percent" /> + <output filename="ui_resources_touch_2x.pak" type="data_package" context="touch_200_percent" /> + <output filename="ui_resources_standard.rc" type="rc_all" context="default_100_percent" /> </outputs> <release seq="1"> - <includes> - <!-- KEEP THESE IN ALPHABETICAL ORDER AND SYNCHRONIZED WITH - ui_resources_2x.grd and ui_resources_touch.grd. THIS MEANS THAT EACH - ICON IN THIS FILE MUST HAVE AN EQUIVALENT ICON IN THE OTHER - FILES. --> - <include name="IDR_BUBBLE_B" file="default_100_percent/bubble_b.png" type="BINDATA" /> - <include name="IDR_BUBBLE_BL" file="default_100_percent/bubble_bl.png" type="BINDATA" /> - <include name="IDR_BUBBLE_BR" file="default_100_percent/bubble_br.png" type="BINDATA" /> - <include name="IDR_BUBBLE_B_ARROW" file="default_100_percent/bubble_pointer_b.png" type="BINDATA" /> - <include name="IDR_BUBBLE_L" file="default_100_percent/bubble_l.png" type="BINDATA" /> - <include name="IDR_BUBBLE_L_ARROW" file="default_100_percent/bubble_pointer_l.png" type="BINDATA" /> - <include name="IDR_BUBBLE_R" file="default_100_percent/bubble_r.png" type="BINDATA" /> - <include name="IDR_BUBBLE_R_ARROW" file="default_100_percent/bubble_pointer_r.png" type="BINDATA" /> - <include name="IDR_BUBBLE_T" file="default_100_percent/bubble_t.png" type="BINDATA" /> - <include name="IDR_BUBBLE_TL" file="default_100_percent/bubble_tl.png" type="BINDATA" /> - <include name="IDR_BUBBLE_TR" file="default_100_percent/bubble_tr.png" type="BINDATA" /> - <include name="IDR_BUBBLE_T_ARROW" file="default_100_percent/bubble_pointer_t.png" type="BINDATA" /> + <structures fallback_to_low_resolution="true"> + <!-- KEEP THESE IN ALPHABETICAL ORDER! --> + <structure type="chrome_scaled_image" name="IDR_BUBBLE_B" file="bubble_b.png" /> + <structure type="chrome_scaled_image" name="IDR_BUBBLE_BL" file="bubble_bl.png" /> + <structure type="chrome_scaled_image" name="IDR_BUBBLE_BR" file="bubble_br.png" /> + <structure type="chrome_scaled_image" name="IDR_BUBBLE_B_ARROW" file="bubble_pointer_b.png" /> + <structure type="chrome_scaled_image" name="IDR_BUBBLE_L" file="bubble_l.png" /> + <structure type="chrome_scaled_image" name="IDR_BUBBLE_L_ARROW" file="bubble_pointer_l.png" /> + <structure type="chrome_scaled_image" name="IDR_BUBBLE_R" file="bubble_r.png" /> + <structure type="chrome_scaled_image" name="IDR_BUBBLE_R_ARROW" file="bubble_pointer_r.png" /> + <structure type="chrome_scaled_image" name="IDR_BUBBLE_T" file="bubble_t.png" /> + <structure type="chrome_scaled_image" name="IDR_BUBBLE_TL" file="bubble_tl.png" /> + <structure type="chrome_scaled_image" name="IDR_BUBBLE_TR" file="bubble_tr.png" /> + <structure type="chrome_scaled_image" name="IDR_BUBBLE_T_ARROW" file="bubble_pointer_t.png" /> - <include name="IDR_BUBBLE_SHADOW_B" file="default_100_percent/bubble_shadow_b.png" type="BINDATA" /> - <include name="IDR_BUBBLE_SHADOW_BL" file="default_100_percent/bubble_shadow_bl.png" type="BINDATA" /> - <include name="IDR_BUBBLE_SHADOW_BR" file="default_100_percent/bubble_shadow_br.png" type="BINDATA" /> - <include name="IDR_BUBBLE_SHADOW_L" file="default_100_percent/bubble_shadow_l.png" type="BINDATA" /> - <include name="IDR_BUBBLE_SHADOW_R" file="default_100_percent/bubble_shadow_r.png" type="BINDATA" /> - <include name="IDR_BUBBLE_SHADOW_T" file="default_100_percent/bubble_shadow_t.png" type="BINDATA" /> - <include name="IDR_BUBBLE_SHADOW_TL" file="default_100_percent/bubble_shadow_tl.png" type="BINDATA" /> - <include name="IDR_BUBBLE_SHADOW_TR" file="default_100_percent/bubble_shadow_tr.png" type="BINDATA" /> + <structure type="chrome_scaled_image" name="IDR_BUBBLE_SHADOW_B" file="bubble_shadow_b.png" /> + <structure type="chrome_scaled_image" name="IDR_BUBBLE_SHADOW_BL" file="bubble_shadow_bl.png" /> + <structure type="chrome_scaled_image" name="IDR_BUBBLE_SHADOW_BR" file="bubble_shadow_br.png" /> + <structure type="chrome_scaled_image" name="IDR_BUBBLE_SHADOW_L" file="bubble_shadow_l.png" /> + <structure type="chrome_scaled_image" name="IDR_BUBBLE_SHADOW_R" file="bubble_shadow_r.png" /> + <structure type="chrome_scaled_image" name="IDR_BUBBLE_SHADOW_T" file="bubble_shadow_t.png" /> + <structure type="chrome_scaled_image" name="IDR_BUBBLE_SHADOW_TL" file="bubble_shadow_tl.png" /> + <structure type="chrome_scaled_image" name="IDR_BUBBLE_SHADOW_TR" file="bubble_shadow_tr.png" /> - <include name="IDR_CLOSE_BAR" file="default_100_percent/close_bar.png" type="BINDATA" /> - <include name="IDR_CLOSE_BAR_H" file="default_100_percent/close_bar_hover.png" type="BINDATA" /> - <include name="IDR_CLOSE_BAR_MASK" file="default_100_percent/close_bar_mask.png" type="BINDATA" /> - <include name="IDR_CLOSE_BAR_P" file="default_100_percent/close_bar_pressed.png" type="BINDATA" /> - <include name="IDR_THROBBER" file="default_100_percent/throbber.png" type="BINDATA" /> + <structure type="chrome_scaled_image" name="IDR_CLOSE_BAR" file="close_bar.png" /> + <structure type="chrome_scaled_image" name="IDR_CLOSE_BAR_H" file="close_bar_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_CLOSE_BAR_MASK" file="close_bar_mask.png" /> + <structure type="chrome_scaled_image" name="IDR_CLOSE_BAR_P" file="close_bar_pressed.png" /> + <structure type="chrome_scaled_image" name="IDR_THROBBER" file="throbber.png" /> <!-- Remaining images only used by Aura. --> + <!-- TODO(flackr): These are 1x assets, we have to replace these before + attempting to use them at 2x where they will be rendered as half + the intended size. --> <if expr="pp_ifdef('use_aura')"> - <include name="IDR_AURA_WINDOW_BUTTON_SEPARATOR" file="default_100_percent/aura/window_button_separator.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_CLOSE" file="default_100_percent/aura/window_close_normal.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_CLOSE_H" file="default_100_percent/aura/window_close_hover.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_CLOSE_P" file="default_100_percent/aura/window_close_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE" file="default_100_percent/aura/window_fullscreen_close_normal.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE_H" file="default_100_percent/aura/window_fullscreen_close_hover.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE_P" file="default_100_percent/aura/window_fullscreen_close_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE" file="default_100_percent/aura/window_fullscreen_restore_normal.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE_H" file="default_100_percent/aura/window_fullscreen_restore_hover.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE_P" file="default_100_percent/aura/window_fullscreen_restore_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_FULLSCREEN_SEPARATOR" file="default_100_percent/aura/window_fullscreen_separator.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZE" file="default_100_percent/aura/window_maximize_normal.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZE_H" file="default_100_percent/aura/window_maximize_hover.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZE_P" file="default_100_percent/aura/window_maximize_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE" file="default_100_percent/aura/window_maximized_close_normal.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE_H" file="default_100_percent/aura/window_maximized_close_hover.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE_P" file="default_100_percent/aura/window_maximized_close_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE" file="default_100_percent/aura/window_maximized_minimize_normal.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE_H" file="default_100_percent/aura/window_maximized_minimize_hover.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE_P" file="default_100_percent/aura/window_maximized_minimize_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_LEFT_P" file="default_100_percent/aura/window_maximized_snap_left_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_MINIMIZE_P" file="default_100_percent/aura/window_maximized_snap_minimize_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_P" file="default_100_percent/aura/window_maximized_snap_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_RIGHT_P" file="default_100_percent/aura/window_maximized_snap_right_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE" file="default_100_percent/aura/window_maximized_restore_normal.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE_H" file="default_100_percent/aura/window_maximized_restore_hover.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE_P" file="default_100_percent/aura/window_maximized_restore_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_SNAP_LEFT_P" file="default_100_percent/aura/window_snap_left_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_SNAP_MINIMIZE_P" file="default_100_percent/aura/window_snap_minimize_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_SNAP_P" file="default_100_percent/aura/window_snap_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_SNAP_RIGHT_P" file="default_100_percent/aura/window_snap_right_pressed.png" type="BINDATA" /> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_BUTTON_SEPARATOR" file="aura/window_button_separator.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CLOSE" file="aura/window_close_normal.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CLOSE_H" file="aura/window_close_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CLOSE_P" file="aura/window_close_pressed.png" /> + <!-- TODO(benrg): Get rid of all conditionals that test the output + context. --> + <if expr="context.startswith('default_')"> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE" file="aura/window_fullscreen_close_normal.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE_H" file="aura/window_fullscreen_close_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE_P" file="aura/window_fullscreen_close_pressed.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE" file="aura/window_fullscreen_restore_normal.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE_H" file="aura/window_fullscreen_restore_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE_P" file="aura/window_fullscreen_restore_pressed.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_SEPARATOR" file="aura/window_fullscreen_separator.png" /> + </if> + <if expr="not context.startswith('default_')"> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE" file="aura/window_close_normal.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE_H" file="aura/window_close_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE_P" file="aura/window_close_pressed.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE" file="aura/window_restore_normal.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE_H" file="aura/window_restore_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE_P" file="aura/window_restore_pressed.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_FULLSCREEN_SEPARATOR" file="aura/window_button_separator.png" /> + </if> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZE" file="aura/window_maximize_normal.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZE_H" file="aura/window_maximize_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZE_P" file="aura/window_maximize_pressed.png" /> + <if expr="context.startswith('default_')"> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE" file="aura/window_maximized_close_normal.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE_H" file="aura/window_maximized_close_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE_P" file="aura/window_maximized_close_pressed.png" /> + </if> + <if expr="not context.startswith('default_')"> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE" file="aura/window_close_normal.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE_H" file="aura/window_close_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE_P" file="aura/window_close_pressed.png" /> + </if> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE" file="aura/window_maximized_minimize_normal.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE_H" file="aura/window_maximized_minimize_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE_P" file="aura/window_maximized_minimize_pressed.png" /> + <if expr="context.startswith('default_')"> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_LEFT_P" file="aura/window_maximized_snap_left_pressed.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_MINIMIZE_P" file="aura/window_maximized_snap_minimize_pressed.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_P" file="aura/window_maximized_snap_pressed.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_RIGHT_P" file="aura/window_maximized_snap_right_pressed.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE" file="aura/window_maximized_restore_normal.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE_H" file="aura/window_maximized_restore_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE_P" file="aura/window_maximized_restore_pressed.png" /> + </if> + <if expr="not context.startswith('default_')"> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_LEFT_P" file="aura/window_snap_left_pressed.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_MINIMIZE_P" file="aura/window_snap_minimize_pressed.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_P" file="aura/window_snap_pressed.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_RIGHT_P" file="aura/window_snap_right_pressed.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE" file="aura/window_restore_normal.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE_H" file="aura/window_restore_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE_P" file="aura/window_restore_pressed.png" /> + </if> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_SNAP_LEFT_P" file="aura/window_snap_left_pressed.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_SNAP_MINIMIZE_P" file="aura/window_snap_minimize_pressed.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_SNAP_P" file="aura/window_snap_pressed.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_SNAP_RIGHT_P" file="aura/window_snap_right_pressed.png" /> <!-- cursors --> - <include name="IDR_AURA_CURSOR_PTR" file="default_100_percent/aura/left_ptr.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_NO_DROP" file="default_100_percent/aura/nodrop.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_COPY" file="default_100_percent/aura/copy.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_HAND" file="default_100_percent/aura/hand2.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_FLEUR" file="default_100_percent/aura/fleur.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_IBEAM" file="default_100_percent/aura/xterm.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_NORTH_WEST_RESIZE" file="default_100_percent/aura/top_left_corner.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_SOUTH_EAST_RESIZE" file="default_100_percent/aura/top_left_corner.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_NORTH_EAST_RESIZE" file="default_100_percent/aura/top_right_corner.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_SOUTH_WEST_RESIZE" file="default_100_percent/aura/top_right_corner.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_NORTH_RESIZE" file="default_100_percent/aura/sb_v_double_arrow.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_EAST_RESIZE" file="default_100_percent/aura/sb_h_double_arrow.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_SOUTH_RESIZE" file="default_100_percent/aura/sb_v_double_arrow.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_WEST_RESIZE" file="default_100_percent/aura/sb_h_double_arrow.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_ALIAS" file="default_100_percent/aura/alias.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_CELL" file="default_100_percent/aura/cell.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_CONTEXT_MENU" file="default_100_percent/aura/context_menu.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_CROSSHAIR" file="default_100_percent/aura/crosshair.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_HELP" file="default_100_percent/aura/help.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_MOVE" file="default_100_percent/aura/move.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_XTERM_HORIZ" file="default_100_percent/aura/xterm_horiz.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_ZOOM_IN" file="default_100_percent/aura/zoom_in.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_ZOOM_OUT" file="default_100_percent/aura/zoom_out.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_ROW_RESIZE" file="default_100_percent/aura/sb_v_double_arrow.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_COL_RESIZE" file="default_100_percent/aura/sb_h_double_arrow.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_NORTH_WEST_SOUTH_EAST_RESIZE" file="default_100_percent/aura/top_left_corner.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_NORTH_EAST_SOUTH_WEST_RESIZE" file="default_100_percent/aura/top_right_corner.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_NORTH_SOUTH_RESIZE" file="default_100_percent/aura/sb_v_double_arrow.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_EAST_WEST_RESIZE" file="default_100_percent/aura/sb_h_double_arrow.png" type="BINDATA" /> + <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_PTR" file="aura/left_ptr.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_NO_DROP" file="aura/nodrop.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_COPY" file="aura/copy.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_HAND" file="aura/hand2.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_FLEUR" file="aura/fleur.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_IBEAM" file="aura/xterm.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_NORTH_WEST_RESIZE" file="aura/top_left_corner.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_SOUTH_EAST_RESIZE" file="aura/top_left_corner.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_NORTH_EAST_RESIZE" file="aura/top_right_corner.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_SOUTH_WEST_RESIZE" file="aura/top_right_corner.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_NORTH_RESIZE" file="aura/sb_v_double_arrow.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_EAST_RESIZE" file="aura/sb_h_double_arrow.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_SOUTH_RESIZE" file="aura/sb_v_double_arrow.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_WEST_RESIZE" file="aura/sb_h_double_arrow.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_ALIAS" file="aura/alias.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_CELL" file="aura/cell.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_CONTEXT_MENU" file="aura/context_menu.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_CROSSHAIR" file="aura/crosshair.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_HELP" file="aura/help.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_MOVE" file="aura/move.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_XTERM_HORIZ" file="aura/xterm_horiz.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_ZOOM_IN" file="aura/zoom_in.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_ZOOM_OUT" file="aura/zoom_out.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_ROW_RESIZE" file="aura/sb_v_double_arrow.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_COL_RESIZE" file="aura/sb_h_double_arrow.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_NORTH_WEST_SOUTH_EAST_RESIZE" file="aura/top_left_corner.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_NORTH_EAST_SOUTH_WEST_RESIZE" file="aura/top_right_corner.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_NORTH_SOUTH_RESIZE" file="aura/sb_v_double_arrow.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_EAST_WEST_RESIZE" file="aura/sb_h_double_arrow.png" /> <!-- uber-tray --> - <include name="IDR_AURA_UBER_TRAY_VOLUME_LEVELS" file="default_100_percent/ash/status_volume_all.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_VOLUME_MUTE" file="default_100_percent/ash/status_volume_mute.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_BRIGHTNESS" file="default_100_percent/ash/status_brightness.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_SETTINGS" file="default_100_percent/ash/status_settings.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_POWER_SMALL" file="default_100_percent/ash/status_power_small_all.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_POWER_SMALL_DARK" file="default_100_percent/ash/status_power_small_all_dark.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_NETWORK_AIRPLANE" file="default_100_percent/ash/status_network_airplane.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_NETWORK_INFO" file="default_100_percent/ash/status_network_info.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_NETWORK_INFO_HOVER" file="default_100_percent/ash/status_network_info_h.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_NETWORK_FAILED" file="default_100_percent/ash/status_network_failed.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_NETWORK_DATA_LOW" file="default_100_percent/ash/status_data_low.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_NETWORK_DATA_NONE" file="default_100_percent/ash/status_data_none.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_SMS" file="default_100_percent/ash/status_sms.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_MORE" file="default_100_percent/ash/status_more.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_LESS" file="default_100_percent/ash/status_less.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_ACCESSIBILITY" file="default_100_percent/ash/status_accessibility_mode.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_ACCESSIBILITY_DARK" file="default_100_percent/ash/status_accessibility_dark.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_CAPS_LOCK" file="default_100_percent/ash/status_capslock.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_CAPS_LOCK_DARK" file="default_100_percent/ash/status_capslock_dark.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_BLUETOOTH" file="default_100_percent/ash/status_bluetooth.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_DRIVE" file="default_100_percent/ash/status_drive.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_DRIVE_FAILED" file="default_100_percent/ash/status_drive_item_failed.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_DRIVE_DONE" file="default_100_percent/ash/status_drive_item_done.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_DRIVE_CANCEL" file="default_100_percent/ash/status_drive_item_cancel.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_DRIVE_CANCEL_HOVER" file="default_100_percent/ash/status_drive_item_cancel_hover.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_DRIVE_LIGHT" file="default_100_percent/ash/status_drive_light.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_IME" file="default_100_percent/ash/status_ime.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_UPDATE" file="default_100_percent/ash/status_update.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_UPDATE_DARK" file="default_100_percent/ash/status_update_dark.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_WIFI_ENABLED" file="default_100_percent/ash/status_wifi_enabled.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_WIFI_ENABLED_HOVER" file="default_100_percent/ash/status_wifi_enabled_h.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_WIFI_DISABLED" file="default_100_percent/ash/status_wifi_disabled.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_WIFI_DISABLED_HOVER" file="default_100_percent/ash/status_wifi_disabled_h.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_CELLULAR_ENABLED" file="default_100_percent/ash/status_cellular_enabled.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_CELLULAR_ENABLED_HOVER" file="default_100_percent/ash/status_cellular_enabled_h.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_CELLULAR_DISABLED" file="default_100_percent/ash/status_cellular_disabled.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_CELLULAR_DISABLED_HOVER" file="default_100_percent/ash/status_cellular_disabled_h.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED" file="default_100_percent/ash/status_bluetooth_enabled.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED_HOVER" file="default_100_percent/ash/status_bluetooth_enabled_h.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED" file="default_100_percent/ash/status_bluetooth_disabled.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED_HOVER" file="default_100_percent/ash/status_bluetooth_disabled_h.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_SHUTDOWN" file="default_100_percent/ash/status_shutdown.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_SHUTDOWN_HOVER" file="default_100_percent/ash/status_shutdown_h.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_LOCKSCREEN" file="default_100_percent/ash/status_lockscreen.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_LOCKSCREEN_HOVER" file="default_100_percent/ash/status_lockscreen_h.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_HELP" file="default_100_percent/ash/status_help.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_HELP_HOVER" file="default_100_percent/ash/status_help_h.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_LOCALE" file="default_100_percent/ash/status_locale.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_WEB_NOTIFICATON" file="default_100_percent/ash/statusbar_notifications.png" type="BINDATA" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_VOLUME_LEVELS" file="ash/status_volume_all.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_VOLUME_MUTE" file="ash/status_volume_mute.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_BRIGHTNESS" file="ash/status_brightness.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SETTINGS" file="ash/status_settings.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_POWER_SMALL" file="ash/status_power_small_all.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_POWER_SMALL_DARK" file="ash/status_power_small_all_dark.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_AIRPLANE" file="ash/status_network_airplane.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_INFO" file="ash/status_network_info.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_INFO_HOVER" file="ash/status_network_info_h.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_FAILED" file="ash/status_network_failed.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_DATA_LOW" file="ash/status_data_low.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_DATA_NONE" file="ash/status_data_none.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SMS" file="ash/status_sms.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_MORE" file="ash/status_more.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_LESS" file="ash/status_less.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_ACCESSIBILITY" file="ash/status_accessibility_mode.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_ACCESSIBILITY_DARK" file="ash/status_accessibility_dark.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_CAPS_LOCK" file="ash/status_capslock.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_CAPS_LOCK_DARK" file="ash/status_capslock_dark.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_BLUETOOTH" file="ash/status_bluetooth.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_DRIVE" file="ash/status_drive.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_DRIVE_FAILED" file="ash/status_drive_item_failed.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_DRIVE_DONE" file="ash/status_drive_item_done.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_DRIVE_CANCEL" file="ash/status_drive_item_cancel.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_DRIVE_CANCEL_HOVER" file="ash/status_drive_item_cancel_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_DRIVE_LIGHT" file="ash/status_drive_light.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_IME" file="ash/status_ime.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE" file="ash/status_update.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE_DARK" file="ash/status_update_dark.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_ENABLED" file="ash/status_wifi_enabled.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_ENABLED_HOVER" file="ash/status_wifi_enabled_h.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_DISABLED" file="ash/status_wifi_disabled.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_DISABLED_HOVER" file="ash/status_wifi_disabled_h.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_CELLULAR_ENABLED" file="ash/status_cellular_enabled.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_CELLULAR_ENABLED_HOVER" file="ash/status_cellular_enabled_h.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_CELLULAR_DISABLED" file="ash/status_cellular_disabled.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_CELLULAR_DISABLED_HOVER" file="ash/status_cellular_disabled_h.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED" file="ash/status_bluetooth_enabled.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED_HOVER" file="ash/status_bluetooth_enabled_h.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED" file="ash/status_bluetooth_disabled.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED_HOVER" file="ash/status_bluetooth_disabled_h.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SHUTDOWN" file="ash/status_shutdown.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SHUTDOWN_HOVER" file="ash/status_shutdown_h.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_LOCKSCREEN" file="ash/status_lockscreen.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_LOCKSCREEN_HOVER" file="ash/status_lockscreen_h.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_HELP" file="ash/status_help.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_HELP_HOVER" file="ash/status_help_h.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_LOCALE" file="ash/status_locale.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WEB_NOTIFICATON" file="ash/statusbar_notifications.png" /> </if> <if expr="is_posix and not is_macosx and not pp_ifdef('use_aura')"> - <include name="IDR_CHECKBOX_DISABLED_INDETERMINATE" file="default_100_percent/linux-checkbox-disabled-indeterminate.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_DISABLED_OFF" file="default_100_percent/linux-checkbox-disabled-off.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_DISABLED_ON" file="default_100_percent/linux-checkbox-disabled-on.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_INDETERMINATE" file="default_100_percent/linux-checkbox-indeterminate.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_OFF" file="default_100_percent/linux-checkbox-off.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_ON" file="default_100_percent/linux-checkbox-on.png" type="BINDATA" /> - <include name="IDR_RADIO_DISABLED_OFF" file="default_100_percent/linux-radio-disabled-off.png" type="BINDATA" /> - <include name="IDR_RADIO_DISABLED_ON" file="default_100_percent/linux-radio-disabled-on.png" type="BINDATA" /> - <include name="IDR_RADIO_OFF" file="default_100_percent/linux-radio-off.png" type="BINDATA" /> - <include name="IDR_RADIO_ON" file="default_100_percent/linux-radio-on.png" type="BINDATA" /> - <include name="IDR_PROGRESS_BAR" file="default_100_percent/linux-progress-bar.png" type="BINDATA" /> - <include name="IDR_PROGRESS_BORDER_LEFT" file="default_100_percent/linux-progress-border-left.png" type="BINDATA" /> - <include name="IDR_PROGRESS_BORDER_RIGHT" file="default_100_percent/linux-progress-border-right.png" type="BINDATA" /> - <include name="IDR_PROGRESS_VALUE" file="default_100_percent/linux-progress-value.png" type="BINDATA" /> + <structure type="chrome_scaled_image" name="IDR_CHECKBOX_DISABLED_INDETERMINATE" file="linux-checkbox-disabled-indeterminate.png" /> + <structure type="chrome_scaled_image" name="IDR_CHECKBOX_DISABLED_OFF" file="linux-checkbox-disabled-off.png" /> + <structure type="chrome_scaled_image" name="IDR_CHECKBOX_DISABLED_ON" file="linux-checkbox-disabled-on.png" /> + <structure type="chrome_scaled_image" name="IDR_CHECKBOX_INDETERMINATE" file="linux-checkbox-indeterminate.png" /> + <structure type="chrome_scaled_image" name="IDR_CHECKBOX_OFF" file="linux-checkbox-off.png" /> + <structure type="chrome_scaled_image" name="IDR_CHECKBOX_ON" file="linux-checkbox-on.png" /> + <structure type="chrome_scaled_image" name="IDR_RADIO_DISABLED_OFF" file="linux-radio-disabled-off.png" /> + <structure type="chrome_scaled_image" name="IDR_RADIO_DISABLED_ON" file="linux-radio-disabled-on.png" /> + <structure type="chrome_scaled_image" name="IDR_RADIO_OFF" file="linux-radio-off.png" /> + <structure type="chrome_scaled_image" name="IDR_RADIO_ON" file="linux-radio-on.png" /> + <structure type="chrome_scaled_image" name="IDR_PROGRESS_BAR" file="linux-progress-bar.png" /> + <structure type="chrome_scaled_image" name="IDR_PROGRESS_BORDER_LEFT" file="linux-progress-border-left.png" /> + <structure type="chrome_scaled_image" name="IDR_PROGRESS_BORDER_RIGHT" file="linux-progress-border-right.png" /> + <structure type="chrome_scaled_image" name="IDR_PROGRESS_VALUE" file="linux-progress-value.png" /> </if> <!-- TODO(jamescook): Replace Linux images with Aura-specific ones. --> <if expr="pp_ifdef('use_aura')"> - <include name="IDR_CHECKBOX_DISABLED_INDETERMINATE" file="default_100_percent/linux-checkbox-disabled-indeterminate.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_DISABLED_OFF" file="default_100_percent/linux-checkbox-disabled-off.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_DISABLED_ON" file="default_100_percent/linux-checkbox-disabled-on.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_INDETERMINATE" file="default_100_percent/linux-checkbox-indeterminate.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_OFF" file="default_100_percent/linux-checkbox-off.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_ON" file="default_100_percent/linux-checkbox-on.png" type="BINDATA" /> - <include name="IDR_RADIO_DISABLED_OFF" file="default_100_percent/linux-radio-disabled-off.png" type="BINDATA" /> - <include name="IDR_RADIO_DISABLED_ON" file="default_100_percent/linux-radio-disabled-on.png" type="BINDATA" /> - <include name="IDR_RADIO_OFF" file="default_100_percent/linux-radio-off.png" type="BINDATA" /> - <include name="IDR_RADIO_ON" file="default_100_percent/linux-radio-on.png" type="BINDATA" /> - <include name="IDR_PROGRESS_BAR" file="default_100_percent/linux-progress-bar.png" type="BINDATA" /> - <include name="IDR_PROGRESS_BORDER_LEFT" file="default_100_percent/linux-progress-border-left.png" type="BINDATA" /> - <include name="IDR_PROGRESS_BORDER_RIGHT" file="default_100_percent/linux-progress-border-right.png" type="BINDATA" /> - <include name="IDR_PROGRESS_VALUE" file="default_100_percent/linux-progress-value.png" type="BINDATA" /> + <structure type="chrome_scaled_image" name="IDR_CHECKBOX_DISABLED_INDETERMINATE" file="linux-checkbox-disabled-indeterminate.png" /> + <structure type="chrome_scaled_image" name="IDR_CHECKBOX_DISABLED_OFF" file="linux-checkbox-disabled-off.png" /> + <structure type="chrome_scaled_image" name="IDR_CHECKBOX_DISABLED_ON" file="linux-checkbox-disabled-on.png" /> + <structure type="chrome_scaled_image" name="IDR_CHECKBOX_INDETERMINATE" file="linux-checkbox-indeterminate.png" /> + <structure type="chrome_scaled_image" name="IDR_CHECKBOX_OFF" file="linux-checkbox-off.png" /> + <structure type="chrome_scaled_image" name="IDR_CHECKBOX_ON" file="linux-checkbox-on.png" /> + <structure type="chrome_scaled_image" name="IDR_RADIO_DISABLED_OFF" file="linux-radio-disabled-off.png" /> + <structure type="chrome_scaled_image" name="IDR_RADIO_DISABLED_ON" file="linux-radio-disabled-on.png" /> + <structure type="chrome_scaled_image" name="IDR_RADIO_OFF" file="linux-radio-off.png" /> + <structure type="chrome_scaled_image" name="IDR_RADIO_ON" file="linux-radio-on.png" /> + <structure type="chrome_scaled_image" name="IDR_PROGRESS_BAR" file="linux-progress-bar.png" /> + <structure type="chrome_scaled_image" name="IDR_PROGRESS_BORDER_LEFT" file="linux-progress-border-left.png" /> + <structure type="chrome_scaled_image" name="IDR_PROGRESS_BORDER_RIGHT" file="linux-progress-border-right.png" /> + <structure type="chrome_scaled_image" name="IDR_PROGRESS_VALUE" file="linux-progress-value.png" /> - <include name="IDR_SCROLL_BASE_CORNER" file="default_100_percent/scrollbar_base_normal_edge.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_CORNER_H" file="default_100_percent/scrollbar_base_hover_edge.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_HORIZONTAL_CENTER" file="default_100_percent/scrollbar_base_horizontal_normal_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_HORIZONTAL_CENTER_H" file="default_100_percent/scrollbar_base_horizontal_hover_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_HORIZONTAL_LEFT" file="default_100_percent/scrollbar_base_horizontal_normal_left.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_HORIZONTAL_LEFT_H" file="default_100_percent/scrollbar_base_horizontal_hover_left.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_HORIZONTAL_RIGHT" file="default_100_percent/scrollbar_base_horizontal_normal_right.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_HORIZONTAL_RIGHT_H" file="default_100_percent/scrollbar_base_horizontal_hover_right.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_VERTICAL_BOTTOM" file="default_100_percent/scrollbar_base_vertical_normal_bottom.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_VERTICAL_BOTTOM_H" file="default_100_percent/scrollbar_base_vertical_hover_bottom.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_VERTICAL_CENTER" file="default_100_percent/scrollbar_base_vertical_normal_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_VERTICAL_CENTER_H" file="default_100_percent/scrollbar_base_vertical_hover_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_VERTICAL_TOP" file="default_100_percent/scrollbar_base_vertical_normal_top.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_VERTICAL_TOP_H" file="default_100_percent/scrollbar_base_vertical_hover_top.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_HORIZONTAL_CENTER" file="default_100_percent/scrollbar_thumb_horizontal_normal_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_HORIZONTAL_CENTER_H" file="default_100_percent/scrollbar_thumb_horizontal_hover_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_HORIZONTAL_CENTER_P" file="default_100_percent/scrollbar_thumb_horizontal_pressed_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_HORIZONTAL_LEFT" file="default_100_percent/scrollbar_thumb_horizontal_normal_left.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_HORIZONTAL_LEFT_H" file="default_100_percent/scrollbar_thumb_horizontal_hover_left.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_HORIZONTAL_LEFT_P" file="default_100_percent/scrollbar_thumb_horizontal_pressed_left.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_HORIZONTAL_RIGHT" file="default_100_percent/scrollbar_thumb_horizontal_normal_right.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_HORIZONTAL_RIGHT_H" file="default_100_percent/scrollbar_thumb_horizontal_hover_right.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_HORIZONTAL_RIGHT_P" file="default_100_percent/scrollbar_thumb_horizontal_pressed_right.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_VERTICAL_BOTTOM" file="default_100_percent/scrollbar_thumb_vertical_normal_bottom.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_VERTICAL_BOTTOM_H" file="default_100_percent/scrollbar_thumb_vertical_hover_bottom.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_VERTICAL_BOTTOM_P" file="default_100_percent/scrollbar_thumb_vertical_pressed_bottom.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_VERTICAL_CENTER" file="default_100_percent/scrollbar_thumb_vertical_normal_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_VERTICAL_CENTER_H" file="default_100_percent/scrollbar_thumb_vertical_hover_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_VERTICAL_CENTER_P" file="default_100_percent/scrollbar_thumb_vertical_pressed_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_VERTICAL_TOP" file="default_100_percent/scrollbar_thumb_vertical_normal_top.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_VERTICAL_TOP_H" file="default_100_percent/scrollbar_thumb_vertical_hover_top.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_VERTICAL_TOP_P" file="default_100_percent/scrollbar_thumb_vertical_pressed_top.png" type="BINDATA" /> + <structure type="chrome_scaled_image" name="IDR_SCROLL_BASE_CORNER" file="scrollbar_base_normal_edge.png" /> + <structure type="chrome_scaled_image" name="IDR_SCROLL_BASE_CORNER_H" file="scrollbar_base_hover_edge.png" /> + <structure type="chrome_scaled_image" name="IDR_SCROLL_BASE_HORIZONTAL_CENTER" file="scrollbar_base_horizontal_normal_center.png" /> + <structure type="chrome_scaled_image" name="IDR_SCROLL_BASE_HORIZONTAL_CENTER_H" file="scrollbar_base_horizontal_hover_center.png" /> + <structure type="chrome_scaled_image" name="IDR_SCROLL_BASE_HORIZONTAL_LEFT" file="scrollbar_base_horizontal_normal_left.png" /> + <structure type="chrome_scaled_image" name="IDR_SCROLL_BASE_HORIZONTAL_LEFT_H" file="scrollbar_base_horizontal_hover_left.png" /> + <structure type="chrome_scaled_image" name="IDR_SCROLL_BASE_HORIZONTAL_RIGHT" file="scrollbar_base_horizontal_normal_right.png" /> + <structure type="chrome_scaled_image" name="IDR_SCROLL_BASE_HORIZONTAL_RIGHT_H" file="scrollbar_base_horizontal_hover_right.png" /> + <structure type="chrome_scaled_image" name="IDR_SCROLL_BASE_VERTICAL_BOTTOM" file="scrollbar_base_vertical_normal_bottom.png" /> + <structure type="chrome_scaled_image" name="IDR_SCROLL_BASE_VERTICAL_BOTTOM_H" file="scrollbar_base_vertical_hover_bottom.png" /> + <structure type="chrome_scaled_image" name="IDR_SCROLL_BASE_VERTICAL_CENTER" file="scrollbar_base_vertical_normal_center.png" /> + <structure type="chrome_scaled_image" name="IDR_SCROLL_BASE_VERTICAL_CENTER_H" file="scrollbar_base_vertical_hover_center.png" /> + <structure type="chrome_scaled_image" name="IDR_SCROLL_BASE_VERTICAL_TOP" file="scrollbar_base_vertical_normal_top.png" /> + <structure type="chrome_scaled_image" name="IDR_SCROLL_BASE_VERTICAL_TOP_H" file="scrollbar_base_vertical_hover_top.png" /> + <structure type="chrome_scaled_image" name="IDR_SCROLL_THUMB_HORIZONTAL_CENTER" file="scrollbar_thumb_horizontal_normal_center.png" /> + <structure type="chrome_scaled_image" name="IDR_SCROLL_THUMB_HORIZONTAL_CENTER_H" file="scrollbar_thumb_horizontal_hover_center.png" /> + <structure type="chrome_scaled_image" name="IDR_SCROLL_THUMB_HORIZONTAL_CENTER_P" file="scrollbar_thumb_horizontal_pressed_center.png" /> + <structure type="chrome_scaled_image" name="IDR_SCROLL_THUMB_HORIZONTAL_LEFT" file="scrollbar_thumb_horizontal_normal_left.png" /> + <structure type="chrome_scaled_image" name="IDR_SCROLL_THUMB_HORIZONTAL_LEFT_H" file="scrollbar_thumb_horizontal_hover_left.png" /> + <structure type="chrome_scaled_image" name="IDR_SCROLL_THUMB_HORIZONTAL_LEFT_P" file="scrollbar_thumb_horizontal_pressed_left.png" /> + <structure type="chrome_scaled_image" name="IDR_SCROLL_THUMB_HORIZONTAL_RIGHT" file="scrollbar_thumb_horizontal_normal_right.png" /> + <structure type="chrome_scaled_image" name="IDR_SCROLL_THUMB_HORIZONTAL_RIGHT_H" file="scrollbar_thumb_horizontal_hover_right.png" /> + <structure type="chrome_scaled_image" name="IDR_SCROLL_THUMB_HORIZONTAL_RIGHT_P" file="scrollbar_thumb_horizontal_pressed_right.png" /> + <structure type="chrome_scaled_image" name="IDR_SCROLL_THUMB_VERTICAL_BOTTOM" file="scrollbar_thumb_vertical_normal_bottom.png" /> + <structure type="chrome_scaled_image" name="IDR_SCROLL_THUMB_VERTICAL_BOTTOM_H" file="scrollbar_thumb_vertical_hover_bottom.png" /> + <structure type="chrome_scaled_image" name="IDR_SCROLL_THUMB_VERTICAL_BOTTOM_P" file="scrollbar_thumb_vertical_pressed_bottom.png" /> + <structure type="chrome_scaled_image" name="IDR_SCROLL_THUMB_VERTICAL_CENTER" file="scrollbar_thumb_vertical_normal_center.png" /> + <structure type="chrome_scaled_image" name="IDR_SCROLL_THUMB_VERTICAL_CENTER_H" file="scrollbar_thumb_vertical_hover_center.png" /> + <structure type="chrome_scaled_image" name="IDR_SCROLL_THUMB_VERTICAL_CENTER_P" file="scrollbar_thumb_vertical_pressed_center.png" /> + <structure type="chrome_scaled_image" name="IDR_SCROLL_THUMB_VERTICAL_TOP" file="scrollbar_thumb_vertical_normal_top.png" /> + <structure type="chrome_scaled_image" name="IDR_SCROLL_THUMB_VERTICAL_TOP_H" file="scrollbar_thumb_vertical_hover_top.png" /> + <structure type="chrome_scaled_image" name="IDR_SCROLL_THUMB_VERTICAL_TOP_P" file="scrollbar_thumb_vertical_pressed_top.png" /> </if> - </includes> + </structures> </release> </grit> diff --git a/ui/resources/ui_resources_touch.grd b/ui/resources/ui_resources_touch.grd deleted file mode 100644 index e81c6db..0000000 --- a/ui/resources/ui_resources_touch.grd +++ /dev/null @@ -1,230 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<grit latest_public_release="0" current_release="1"> - <outputs> - <output filename="grit/ui_resources_touch.h" type="rc_header"> - <emit emit_type='prepend'></emit> - </output> - <output filename="grit/ui_resources_touch_map.cc" type="resource_map_source" /> - <output filename="grit/ui_resources_touch_map.h" type="resource_map_header" /> - <output filename="ui_resources_touch.pak" type="data_package" /> - <output filename="ui_resources_touch.rc" type="rc_all" /> - </outputs> - <release seq="1"> - <includes> - <!-- KEEP THESE IN ALPHABETICAL ORDER AND SYNCHRONIZED WITH - ui_resources_standard.grd and ui_resources_2x.grd. THIS MEANS THAT - EACH ICON IN THIS FILE MUST HAVE AN EQUIVALENT ICON IN THE OTHER - FILES. --> - <include name="IDR_BUBBLE_B" file="default_100_percent/bubble_b.png" type="BINDATA" /> - <include name="IDR_BUBBLE_BL" file="default_100_percent/bubble_bl.png" type="BINDATA" /> - <include name="IDR_BUBBLE_BR" file="default_100_percent/bubble_br.png" type="BINDATA" /> - <include name="IDR_BUBBLE_B_ARROW" file="default_100_percent/bubble_pointer_b.png" type="BINDATA" /> - <include name="IDR_BUBBLE_L" file="default_100_percent/bubble_l.png" type="BINDATA" /> - <include name="IDR_BUBBLE_L_ARROW" file="default_100_percent/bubble_pointer_l.png" type="BINDATA" /> - <include name="IDR_BUBBLE_R" file="default_100_percent/bubble_r.png" type="BINDATA" /> - <include name="IDR_BUBBLE_R_ARROW" file="default_100_percent/bubble_pointer_r.png" type="BINDATA" /> - <include name="IDR_BUBBLE_T" file="default_100_percent/bubble_t.png" type="BINDATA" /> - <include name="IDR_BUBBLE_TL" file="default_100_percent/bubble_tl.png" type="BINDATA" /> - <include name="IDR_BUBBLE_TR" file="default_100_percent/bubble_tr.png" type="BINDATA" /> - <include name="IDR_BUBBLE_T_ARROW" file="default_100_percent/bubble_pointer_t.png" type="BINDATA" /> - - <include name="IDR_BUBBLE_SHADOW_B" file="default_100_percent/bubble_shadow_b.png" type="BINDATA" /> - <include name="IDR_BUBBLE_SHADOW_BL" file="default_100_percent/bubble_shadow_bl.png" type="BINDATA" /> - <include name="IDR_BUBBLE_SHADOW_BR" file="default_100_percent/bubble_shadow_br.png" type="BINDATA" /> - <include name="IDR_BUBBLE_SHADOW_L" file="default_100_percent/bubble_shadow_l.png" type="BINDATA" /> - <include name="IDR_BUBBLE_SHADOW_R" file="default_100_percent/bubble_shadow_r.png" type="BINDATA" /> - <include name="IDR_BUBBLE_SHADOW_T" file="default_100_percent/bubble_shadow_t.png" type="BINDATA" /> - <include name="IDR_BUBBLE_SHADOW_TL" file="default_100_percent/bubble_shadow_tl.png" type="BINDATA" /> - <include name="IDR_BUBBLE_SHADOW_TR" file="default_100_percent/bubble_shadow_tr.png" type="BINDATA" /> - - <include name="IDR_CLOSE_BAR" file="default_100_percent/close_bar.png" type="BINDATA" /> - <include name="IDR_CLOSE_BAR_H" file="default_100_percent/close_bar_hover.png" type="BINDATA" /> - <include name="IDR_CLOSE_BAR_MASK" file="default_100_percent/close_bar_mask.png" type="BINDATA" /> - <include name="IDR_CLOSE_BAR_P" file="default_100_percent/close_bar_pressed.png" type="BINDATA" /> - <include name="IDR_THROBBER" file="default_100_percent/throbber.png" type="BINDATA" /> - - <!-- Remaining images only used by Aura. --> - <if expr="pp_ifdef('use_aura')"> - <include name="IDR_AURA_WINDOW_BUTTON_SEPARATOR" file="touch_100_percent/aura/window_button_separator.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_CLOSE" file="touch_100_percent/aura/window_close_normal.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_CLOSE_H" file="touch_100_percent/aura/window_close_hover.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_CLOSE_P" file="touch_100_percent/aura/window_close_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE" file="touch_100_percent/aura/window_close_normal.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE_H" file="touch_100_percent/aura/window_close_hover.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE_P" file="touch_100_percent/aura/window_close_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE" file="touch_100_percent/aura/window_restore_normal.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE_H" file="touch_100_percent/aura/window_restore_hover.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE_P" file="touch_100_percent/aura/window_restore_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_FULLSCREEN_SEPARATOR" file="touch_100_percent/aura/window_button_separator.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZE" file="touch_100_percent/aura/window_maximize_normal.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZE_H" file="touch_100_percent/aura/window_maximize_hover.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZE_P" file="touch_100_percent/aura/window_maximize_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE" file="touch_100_percent/aura/window_close_normal.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE_H" file="touch_100_percent/aura/window_close_hover.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE_P" file="touch_100_percent/aura/window_close_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE" file="touch_100_percent/aura/window_maximized_minimize_normal.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE_H" file="touch_100_percent/aura/window_maximized_minimize_hover.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE_P" file="touch_100_percent/aura/window_maximized_minimize_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_LEFT_P" file="touch_100_percent/aura/window_snap_left_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_MINIMIZE_P" file="touch_100_percent/aura/window_snap_minimize_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_P" file="touch_100_percent/aura/window_snap_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_RIGHT_P" file="touch_100_percent/aura/window_snap_right_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE" file="touch_100_percent/aura/window_restore_normal.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE_H" file="touch_100_percent/aura/window_restore_hover.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE_P" file="touch_100_percent/aura/window_restore_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_SNAP_LEFT_P" file="touch_100_percent/aura/window_snap_left_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_SNAP_MINIMIZE_P" file="touch_100_percent/aura/window_snap_minimize_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_SNAP_P" file="touch_100_percent/aura/window_snap_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_SNAP_RIGHT_P" file="touch_100_percent/aura/window_snap_right_pressed.png" type="BINDATA" /> - <!-- cursors --> - <include name="IDR_AURA_CURSOR_PTR" file="default_100_percent/aura/left_ptr.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_NO_DROP" file="default_100_percent/aura/nodrop.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_COPY" file="default_100_percent/aura/copy.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_HAND" file="default_100_percent/aura/hand2.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_FLEUR" file="default_100_percent/aura/fleur.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_IBEAM" file="default_100_percent/aura/xterm.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_NORTH_WEST_RESIZE" file="default_100_percent/aura/top_left_corner.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_SOUTH_EAST_RESIZE" file="default_100_percent/aura/top_left_corner.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_NORTH_EAST_RESIZE" file="default_100_percent/aura/top_right_corner.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_SOUTH_WEST_RESIZE" file="default_100_percent/aura/top_right_corner.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_NORTH_RESIZE" file="default_100_percent/aura/sb_v_double_arrow.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_EAST_RESIZE" file="default_100_percent/aura/sb_h_double_arrow.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_SOUTH_RESIZE" file="default_100_percent/aura/sb_v_double_arrow.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_WEST_RESIZE" file="default_100_percent/aura/sb_h_double_arrow.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_ALIAS" file="default_100_percent/aura/alias.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_CELL" file="default_100_percent/aura/cell.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_CONTEXT_MENU" file="default_100_percent/aura/context_menu.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_CROSSHAIR" file="default_100_percent/aura/crosshair.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_HELP" file="default_100_percent/aura/help.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_MOVE" file="default_100_percent/aura/move.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_XTERM_HORIZ" file="default_100_percent/aura/xterm_horiz.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_ZOOM_IN" file="default_100_percent/aura/zoom_in.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_ZOOM_OUT" file="default_100_percent/aura/zoom_out.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_ROW_RESIZE" file="default_100_percent/aura/sb_v_double_arrow.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_COL_RESIZE" file="default_100_percent/aura/sb_h_double_arrow.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_NORTH_WEST_SOUTH_EAST_RESIZE" file="default_100_percent/aura/top_left_corner.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_NORTH_EAST_SOUTH_WEST_RESIZE" file="default_100_percent/aura/top_right_corner.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_NORTH_SOUTH_RESIZE" file="default_100_percent/aura/sb_v_double_arrow.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_EAST_WEST_RESIZE" file="default_100_percent/aura/sb_h_double_arrow.png" type="BINDATA" /> - <!-- uber-tray --> - <include name="IDR_AURA_UBER_TRAY_VOLUME_LEVELS" file="default_100_percent/ash/status_volume_all.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_VOLUME_MUTE" file="default_100_percent/ash/status_volume_mute.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_BRIGHTNESS" file="default_100_percent/ash/status_brightness.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_SETTINGS" file="default_100_percent/ash/status_settings.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_POWER_SMALL" file="default_100_percent/ash/status_power_small_all.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_POWER_SMALL_DARK" file="default_100_percent/ash/status_power_small_all_dark.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_NETWORK_AIRPLANE" file="default_100_percent/ash/status_network_airplane.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_NETWORK_INFO" file="default_100_percent/ash/status_network_info.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_NETWORK_INFO_HOVER" file="default_100_percent/ash/status_network_info_h.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_NETWORK_FAILED" file="default_100_percent/ash/status_network_failed.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_NETWORK_DATA_LOW" file="default_100_percent/ash/status_data_low.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_NETWORK_DATA_NONE" file="default_100_percent/ash/status_data_none.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_SMS" file="default_100_percent/ash/status_sms.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_MORE" file="default_100_percent/ash/status_more.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_LESS" file="default_100_percent/ash/status_less.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_ACCESSIBILITY" file="default_100_percent/ash/status_accessibility_mode.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_ACCESSIBILITY_DARK" file="default_100_percent/ash/status_accessibility_dark.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_CAPS_LOCK" file="default_100_percent/ash/status_capslock.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_CAPS_LOCK_DARK" file="default_100_percent/ash/status_capslock_dark.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_BLUETOOTH" file="default_100_percent/ash/status_bluetooth.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_DRIVE" file="default_100_percent/ash/status_drive.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_DRIVE_FAILED" file="default_100_percent/ash/status_drive_item_failed.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_DRIVE_DONE" file="default_100_percent/ash/status_drive_item_done.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_DRIVE_CANCEL" file="default_100_percent/ash/status_drive_item_cancel.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_DRIVE_CANCEL_HOVER" file="default_100_percent/ash/status_drive_item_cancel_hover.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_DRIVE_LIGHT" file="default_100_percent/ash/status_drive_light.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_IME" file="default_100_percent/ash/status_ime.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_UPDATE" file="default_100_percent/ash/status_update.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_UPDATE_DARK" file="default_100_percent/ash/status_update_dark.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_WIFI_ENABLED" file="default_100_percent/ash/status_wifi_enabled.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_WIFI_ENABLED_HOVER" file="default_100_percent/ash/status_wifi_enabled_h.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_WIFI_DISABLED" file="default_100_percent/ash/status_wifi_disabled.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_WIFI_DISABLED_HOVER" file="default_100_percent/ash/status_wifi_disabled_h.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_CELLULAR_ENABLED" file="default_100_percent/ash/status_cellular_enabled.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_CELLULAR_ENABLED_HOVER" file="default_100_percent/ash/status_cellular_enabled_h.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_CELLULAR_DISABLED" file="default_100_percent/ash/status_cellular_disabled.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_CELLULAR_DISABLED_HOVER" file="default_100_percent/ash/status_cellular_disabled_h.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED" file="default_100_percent/ash/status_bluetooth_enabled.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED_HOVER" file="default_100_percent/ash/status_bluetooth_enabled_h.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED" file="default_100_percent/ash/status_bluetooth_disabled.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED_HOVER" file="default_100_percent/ash/status_bluetooth_disabled_h.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_SHUTDOWN" file="default_100_percent/ash/status_shutdown.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_SHUTDOWN_HOVER" file="default_100_percent/ash/status_shutdown_h.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_LOCKSCREEN" file="default_100_percent/ash/status_lockscreen.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_LOCKSCREEN_HOVER" file="default_100_percent/ash/status_lockscreen_h.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_HELP" file="default_100_percent/ash/status_help.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_HELP_HOVER" file="default_100_percent/ash/status_help_h.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_LOCALE" file="default_100_percent/ash/status_locale.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_WEB_NOTIFICATON" file="default_100_percent/ash/statusbar_notifications.png" type="BINDATA" /> - </if> - - <if expr="is_posix and not is_macosx and not pp_ifdef('use_aura')"> - <include name="IDR_CHECKBOX_DISABLED_INDETERMINATE" file="default_100_percent/linux-checkbox-disabled-indeterminate.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_DISABLED_OFF" file="default_100_percent/linux-checkbox-disabled-off.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_DISABLED_ON" file="default_100_percent/linux-checkbox-disabled-on.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_INDETERMINATE" file="default_100_percent/linux-checkbox-indeterminate.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_OFF" file="default_100_percent/linux-checkbox-off.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_ON" file="default_100_percent/linux-checkbox-on.png" type="BINDATA" /> - <include name="IDR_RADIO_DISABLED_OFF" file="default_100_percent/linux-radio-disabled-off.png" type="BINDATA" /> - <include name="IDR_RADIO_DISABLED_ON" file="default_100_percent/linux-radio-disabled-on.png" type="BINDATA" /> - <include name="IDR_RADIO_OFF" file="default_100_percent/linux-radio-off.png" type="BINDATA" /> - <include name="IDR_RADIO_ON" file="default_100_percent/linux-radio-on.png" type="BINDATA" /> - <include name="IDR_PROGRESS_BAR" file="default_100_percent/linux-progress-bar.png" type="BINDATA" /> - <include name="IDR_PROGRESS_BORDER_LEFT" file="default_100_percent/linux-progress-border-left.png" type="BINDATA" /> - <include name="IDR_PROGRESS_BORDER_RIGHT" file="default_100_percent/linux-progress-border-right.png" type="BINDATA" /> - <include name="IDR_PROGRESS_VALUE" file="default_100_percent/linux-progress-value.png" type="BINDATA" /> - </if> - - <!-- TODO(jamescook): Replace Linux images with Aura-specific ones. --> - <if expr="pp_ifdef('use_aura')"> - <include name="IDR_CHECKBOX_DISABLED_INDETERMINATE" file="default_100_percent/linux-checkbox-disabled-indeterminate.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_DISABLED_OFF" file="default_100_percent/linux-checkbox-disabled-off.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_DISABLED_ON" file="default_100_percent/linux-checkbox-disabled-on.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_INDETERMINATE" file="default_100_percent/linux-checkbox-indeterminate.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_OFF" file="default_100_percent/linux-checkbox-off.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_ON" file="default_100_percent/linux-checkbox-on.png" type="BINDATA" /> - <include name="IDR_RADIO_DISABLED_OFF" file="default_100_percent/linux-radio-disabled-off.png" type="BINDATA" /> - <include name="IDR_RADIO_DISABLED_ON" file="default_100_percent/linux-radio-disabled-on.png" type="BINDATA" /> - <include name="IDR_RADIO_OFF" file="default_100_percent/linux-radio-off.png" type="BINDATA" /> - <include name="IDR_RADIO_ON" file="default_100_percent/linux-radio-on.png" type="BINDATA" /> - <include name="IDR_PROGRESS_BAR" file="default_100_percent/linux-progress-bar.png" type="BINDATA" /> - <include name="IDR_PROGRESS_BORDER_LEFT" file="default_100_percent/linux-progress-border-left.png" type="BINDATA" /> - <include name="IDR_PROGRESS_BORDER_RIGHT" file="default_100_percent/linux-progress-border-right.png" type="BINDATA" /> - <include name="IDR_PROGRESS_VALUE" file="default_100_percent/linux-progress-value.png" type="BINDATA" /> - - <include name="IDR_SCROLL_BASE_CORNER" file="touch_100_percent/scrollbar_base_normal_edge.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_CORNER_H" file="touch_100_percent/scrollbar_base_hover_edge.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_HORIZONTAL_CENTER" file="touch_100_percent/scrollbar_base_horizontal_normal_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_HORIZONTAL_CENTER_H" file="touch_100_percent/scrollbar_base_horizontal_hover_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_HORIZONTAL_LEFT" file="touch_100_percent/scrollbar_base_horizontal_normal_left.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_HORIZONTAL_LEFT_H" file="touch_100_percent/scrollbar_base_horizontal_hover_left.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_HORIZONTAL_RIGHT" file="touch_100_percent/scrollbar_base_horizontal_normal_right.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_HORIZONTAL_RIGHT_H" file="touch_100_percent/scrollbar_base_horizontal_hover_right.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_VERTICAL_BOTTOM" file="touch_100_percent/scrollbar_base_vertical_normal_bottom.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_VERTICAL_BOTTOM_H" file="touch_100_percent/scrollbar_base_vertical_hover_bottom.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_VERTICAL_CENTER" file="touch_100_percent/scrollbar_base_vertical_normal_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_VERTICAL_CENTER_H" file="touch_100_percent/scrollbar_base_vertical_hover_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_VERTICAL_TOP" file="touch_100_percent/scrollbar_base_vertical_normal_top.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_VERTICAL_TOP_H" file="touch_100_percent/scrollbar_base_vertical_hover_top.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_HORIZONTAL_CENTER" file="touch_100_percent/scrollbar_thumb_horizontal_normal_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_HORIZONTAL_CENTER_H" file="touch_100_percent/scrollbar_thumb_horizontal_hover_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_HORIZONTAL_CENTER_P" file="touch_100_percent/scrollbar_thumb_horizontal_pressed_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_HORIZONTAL_LEFT" file="touch_100_percent/scrollbar_thumb_horizontal_normal_left.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_HORIZONTAL_LEFT_H" file="touch_100_percent/scrollbar_thumb_horizontal_hover_left.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_HORIZONTAL_LEFT_P" file="touch_100_percent/scrollbar_thumb_horizontal_pressed_left.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_HORIZONTAL_RIGHT" file="touch_100_percent/scrollbar_thumb_horizontal_normal_right.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_HORIZONTAL_RIGHT_H" file="touch_100_percent/scrollbar_thumb_horizontal_hover_right.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_HORIZONTAL_RIGHT_P" file="touch_100_percent/scrollbar_thumb_horizontal_pressed_right.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_VERTICAL_BOTTOM" file="touch_100_percent/scrollbar_thumb_vertical_normal_bottom.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_VERTICAL_BOTTOM_H" file="touch_100_percent/scrollbar_thumb_vertical_hover_bottom.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_VERTICAL_BOTTOM_P" file="touch_100_percent/scrollbar_thumb_vertical_pressed_bottom.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_VERTICAL_CENTER" file="touch_100_percent/scrollbar_thumb_vertical_normal_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_VERTICAL_CENTER_H" file="touch_100_percent/scrollbar_thumb_vertical_hover_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_VERTICAL_CENTER_P" file="touch_100_percent/scrollbar_thumb_vertical_pressed_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_VERTICAL_TOP" file="touch_100_percent/scrollbar_thumb_vertical_normal_top.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_VERTICAL_TOP_H" file="touch_100_percent/scrollbar_thumb_vertical_hover_top.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_VERTICAL_TOP_P" file="touch_100_percent/scrollbar_thumb_vertical_pressed_top.png" type="BINDATA" /> - </if> - </includes> - </release> -</grit> diff --git a/ui/resources/ui_resources_touch_2x.grd b/ui/resources/ui_resources_touch_2x.grd deleted file mode 100644 index e340daa..0000000 --- a/ui/resources/ui_resources_touch_2x.grd +++ /dev/null @@ -1,230 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<grit latest_public_release="0" current_release="1"> - <outputs> - <output filename="grit/ui_resources_touch_2x.h" type="rc_header"> - <emit emit_type='prepend'></emit> - </output> - <output filename="grit/ui_resources_touch_2x_map.cc" type="resource_map_source" /> - <output filename="grit/ui_resources_touch_2x_map.h" type="resource_map_header" /> - <output filename="ui_resources_touch_2x.pak" type="data_package" /> - <output filename="ui_resources_touch_2x.rc" type="rc_all" /> - </outputs> - <release seq="1"> - <includes> - <!-- KEEP THESE IN ALPHABETICAL ORDER AND SYNCHRONIZED WITH - ui_resources_standard.grd and ui_resources_2x.grd. THIS MEANS THAT - EACH ICON IN THIS FILE MUST HAVE AN EQUIVALENT ICON IN THE OTHER - FILES. --> - <include name="IDR_BUBBLE_B" file="default_200_percent/bubble_b.png" type="BINDATA" /> - <include name="IDR_BUBBLE_BL" file="default_200_percent/bubble_bl.png" type="BINDATA" /> - <include name="IDR_BUBBLE_BR" file="default_200_percent/bubble_br.png" type="BINDATA" /> - <include name="IDR_BUBBLE_B_ARROW" file="default_200_percent/bubble_pointer_b.png" type="BINDATA" /> - <include name="IDR_BUBBLE_L" file="default_200_percent/bubble_l.png" type="BINDATA" /> - <include name="IDR_BUBBLE_L_ARROW" file="default_200_percent/bubble_pointer_l.png" type="BINDATA" /> - <include name="IDR_BUBBLE_R" file="default_200_percent/bubble_r.png" type="BINDATA" /> - <include name="IDR_BUBBLE_R_ARROW" file="default_200_percent/bubble_pointer_r.png" type="BINDATA" /> - <include name="IDR_BUBBLE_T" file="default_200_percent/bubble_t.png" type="BINDATA" /> - <include name="IDR_BUBBLE_TL" file="default_200_percent/bubble_tl.png" type="BINDATA" /> - <include name="IDR_BUBBLE_TR" file="default_200_percent/bubble_tr.png" type="BINDATA" /> - <include name="IDR_BUBBLE_T_ARROW" file="default_200_percent/bubble_pointer_t.png" type="BINDATA" /> - - <include name="IDR_BUBBLE_SHADOW_B" file="default_100_percent/bubble_shadow_b.png" type="BINDATA" /> - <include name="IDR_BUBBLE_SHADOW_BL" file="default_100_percent/bubble_shadow_bl.png" type="BINDATA" /> - <include name="IDR_BUBBLE_SHADOW_BR" file="default_100_percent/bubble_shadow_br.png" type="BINDATA" /> - <include name="IDR_BUBBLE_SHADOW_L" file="default_100_percent/bubble_shadow_l.png" type="BINDATA" /> - <include name="IDR_BUBBLE_SHADOW_R" file="default_100_percent/bubble_shadow_r.png" type="BINDATA" /> - <include name="IDR_BUBBLE_SHADOW_T" file="default_100_percent/bubble_shadow_t.png" type="BINDATA" /> - <include name="IDR_BUBBLE_SHADOW_TL" file="default_100_percent/bubble_shadow_tl.png" type="BINDATA" /> - <include name="IDR_BUBBLE_SHADOW_TR" file="default_100_percent/bubble_shadow_tr.png" type="BINDATA" /> - - <include name="IDR_CLOSE_BAR" file="default_200_percent/close_bar.png" type="BINDATA" /> - <include name="IDR_CLOSE_BAR_H" file="default_200_percent/close_bar_hover.png" type="BINDATA" /> - <include name="IDR_CLOSE_BAR_MASK" file="default_200_percent/close_bar_mask.png" type="BINDATA" /> - <include name="IDR_CLOSE_BAR_P" file="default_200_percent/close_bar_pressed.png" type="BINDATA" /> - <include name="IDR_THROBBER" file="default_200_percent/throbber.png" type="BINDATA" /> - - <!-- Remaining images only used by Aura. --> - <if expr="pp_ifdef('use_aura')"> - <include name="IDR_AURA_WINDOW_BUTTON_SEPARATOR" file="touch_100_percent/aura/window_button_separator.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_CLOSE" file="touch_100_percent/aura/window_close_normal.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_CLOSE_H" file="touch_100_percent/aura/window_close_hover.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_CLOSE_P" file="touch_100_percent/aura/window_close_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE" file="touch_100_percent/aura/window_close_normal.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE_H" file="touch_100_percent/aura/window_close_hover.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE_P" file="touch_100_percent/aura/window_close_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE" file="touch_100_percent/aura/window_restore_normal.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE_H" file="touch_100_percent/aura/window_restore_hover.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE_P" file="touch_100_percent/aura/window_restore_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_FULLSCREEN_SEPARATOR" file="touch_100_percent/aura/window_button_separator.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZE" file="touch_100_percent/aura/window_maximize_normal.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZE_H" file="touch_100_percent/aura/window_maximize_hover.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZE_P" file="touch_100_percent/aura/window_maximize_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE" file="touch_100_percent/aura/window_close_normal.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE_H" file="touch_100_percent/aura/window_close_hover.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE_P" file="touch_100_percent/aura/window_close_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE" file="touch_100_percent/aura/window_maximized_minimize_normal.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE_H" file="touch_100_percent/aura/window_maximized_minimize_hover.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE_P" file="touch_100_percent/aura/window_maximized_minimize_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_LEFT_P" file="touch_100_percent/aura/window_snap_left_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_MINIMIZE_P" file="touch_100_percent/aura/window_snap_minimize_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_P" file="touch_100_percent/aura/window_snap_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_RIGHT_P" file="touch_100_percent/aura/window_snap_right_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE" file="touch_100_percent/aura/window_restore_normal.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE_H" file="touch_100_percent/aura/window_restore_hover.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE_P" file="touch_100_percent/aura/window_restore_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_SNAP_LEFT_P" file="touch_100_percent/aura/window_snap_left_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_SNAP_MINIMIZE_P" file="touch_100_percent/aura/window_snap_minimize_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_SNAP_P" file="touch_100_percent/aura/window_snap_pressed.png" type="BINDATA" /> - <include name="IDR_AURA_WINDOW_SNAP_RIGHT_P" file="touch_100_percent/aura/window_snap_right_pressed.png" type="BINDATA" /> - <!-- cursors --> - <include name="IDR_AURA_CURSOR_PTR" file="default_200_percent/aura/left_ptr.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_NO_DROP" file="default_200_percent/aura/nodrop.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_COPY" file="default_200_percent/aura/copy.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_HAND" file="default_200_percent/aura/hand2.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_FLEUR" file="default_200_percent/aura/fleur.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_IBEAM" file="default_200_percent/aura/xterm.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_NORTH_WEST_RESIZE" file="default_200_percent/aura/top_left_corner.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_SOUTH_EAST_RESIZE" file="default_200_percent/aura/top_left_corner.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_NORTH_EAST_RESIZE" file="default_200_percent/aura/top_right_corner.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_SOUTH_WEST_RESIZE" file="default_200_percent/aura/top_right_corner.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_NORTH_RESIZE" file="default_200_percent/aura/sb_v_double_arrow.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_EAST_RESIZE" file="default_200_percent/aura/sb_h_double_arrow.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_SOUTH_RESIZE" file="default_200_percent/aura/sb_v_double_arrow.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_WEST_RESIZE" file="default_200_percent/aura/sb_h_double_arrow.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_ALIAS" file="default_200_percent/aura/alias.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_CELL" file="default_200_percent/aura/cell.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_CONTEXT_MENU" file="default_200_percent/aura/context_menu.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_CROSSHAIR" file="default_200_percent/aura/crosshair.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_HELP" file="default_200_percent/aura/help.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_MOVE" file="default_200_percent/aura/move.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_XTERM_HORIZ" file="default_200_percent/aura/xterm_horiz.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_ZOOM_IN" file="default_200_percent/aura/zoom_in.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_ZOOM_OUT" file="default_200_percent/aura/zoom_out.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_ROW_RESIZE" file="default_200_percent/aura/sb_v_double_arrow.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_COL_RESIZE" file="default_200_percent/aura/sb_h_double_arrow.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_NORTH_WEST_SOUTH_EAST_RESIZE" file="default_200_percent/aura/top_left_corner.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_NORTH_EAST_SOUTH_WEST_RESIZE" file="default_200_percent/aura/top_right_corner.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_NORTH_SOUTH_RESIZE" file="default_200_percent/aura/sb_v_double_arrow.png" type="BINDATA" /> - <include name="IDR_AURA_CURSOR_EAST_WEST_RESIZE" file="default_200_percent/aura/sb_h_double_arrow.png" type="BINDATA" /> - <!-- uber-tray --> - <include name="IDR_AURA_UBER_TRAY_VOLUME_LEVELS" file="default_100_percent/ash/status_volume_all.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_VOLUME_MUTE" file="default_200_percent/ash/status_volume_mute.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_BRIGHTNESS" file="default_200_percent/ash/status_brightness.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_SETTINGS" file="default_200_percent/ash/status_settings.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_POWER_SMALL" file="default_200_percent/ash/status_power_small_all.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_POWER_SMALL_DARK" file="default_200_percent/ash/status_power_small_all_dark.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_NETWORK_AIRPLANE" file="default_100_percent/ash/status_network_airplane.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_NETWORK_INFO" file="default_200_percent/ash/status_network_info.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_NETWORK_INFO_HOVER" file="default_200_percent/ash/status_network_info_h.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_NETWORK_FAILED" file="default_100_percent/ash/status_network_failed.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_NETWORK_DATA_LOW" file="default_100_percent/ash/status_data_low.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_NETWORK_DATA_NONE" file="default_100_percent/ash/status_data_none.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_SMS" file="default_100_percent/ash/status_sms.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_MORE" file="default_200_percent/ash/status_more.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_LESS" file="default_200_percent/ash/status_less.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_ACCESSIBILITY" file="default_100_percent/ash/status_accessibility_mode.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_ACCESSIBILITY_DARK" file="default_200_percent/ash/status_accessibility_dark.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_CAPS_LOCK" file="default_200_percent/ash/status_capslock.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_CAPS_LOCK_DARK" file="default_200_percent/ash/status_capslock_dark.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_BLUETOOTH" file="default_200_percent/ash/status_bluetooth.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_DRIVE" file="default_100_percent/ash/status_drive.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_DRIVE_FAILED" file="default_100_percent/ash/status_drive_item_failed.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_DRIVE_DONE" file="default_100_percent/ash/status_drive_item_done.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_DRIVE_CANCEL" file="default_100_percent/ash/status_drive_item_cancel.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_DRIVE_CANCEL_HOVER" file="default_100_percent/ash/status_drive_item_cancel_hover.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_DRIVE_LIGHT" file="default_100_percent/ash/status_drive_light.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_IME" file="default_200_percent/ash/status_ime.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_UPDATE" file="default_200_percent/ash/status_update.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_UPDATE_DARK" file="default_200_percent/ash/status_update_dark.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_WIFI_ENABLED" file="default_200_percent/ash/status_wifi_enabled.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_WIFI_ENABLED_HOVER" file="default_200_percent/ash/status_wifi_enabled_h.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_WIFI_DISABLED" file="default_200_percent/ash/status_wifi_disabled.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_WIFI_DISABLED_HOVER" file="default_200_percent/ash/status_wifi_disabled_h.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_CELLULAR_ENABLED" file="default_200_percent/ash/status_cellular_enabled.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_CELLULAR_ENABLED_HOVER" file="default_200_percent/ash/status_cellular_enabled_h.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_CELLULAR_DISABLED" file="default_200_percent/ash/status_cellular_disabled.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_CELLULAR_DISABLED_HOVER" file="default_200_percent/ash/status_cellular_disabled_h.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED" file="default_200_percent/ash/status_bluetooth_enabled.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED_HOVER" file="default_200_percent/ash/status_bluetooth_enabled_h.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED" file="default_200_percent/ash/status_bluetooth_disabled.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED_HOVER" file="default_200_percent/ash/status_bluetooth_disabled_h.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_SHUTDOWN" file="default_200_percent/ash/status_shutdown.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_SHUTDOWN_HOVER" file="default_200_percent/ash/status_shutdown_h.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_LOCKSCREEN" file="default_200_percent/ash/status_lockscreen.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_LOCKSCREEN_HOVER" file="default_200_percent/ash/status_lockscreen_h.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_HELP" file="default_200_percent/ash/status_help.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_HELP_HOVER" file="default_200_percent/ash/status_help_h.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_LOCALE" file="default_100_percent/ash/status_locale.png" type="BINDATA" /> - <include name="IDR_AURA_UBER_TRAY_WEB_NOTIFICATON" file="default_200_percent/ash/statusbar_notifications.png" type="BINDATA" /> - </if> - - <if expr="is_posix and not is_macosx and not pp_ifdef('use_aura')"> - <include name="IDR_CHECKBOX_DISABLED_INDETERMINATE" file="default_100_percent/linux-checkbox-disabled-indeterminate.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_DISABLED_OFF" file="default_100_percent/linux-checkbox-disabled-off.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_DISABLED_ON" file="default_100_percent/linux-checkbox-disabled-on.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_INDETERMINATE" file="default_100_percent/linux-checkbox-indeterminate.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_OFF" file="default_100_percent/linux-checkbox-off.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_ON" file="default_100_percent/linux-checkbox-on.png" type="BINDATA" /> - <include name="IDR_RADIO_DISABLED_OFF" file="default_100_percent/linux-radio-disabled-off.png" type="BINDATA" /> - <include name="IDR_RADIO_DISABLED_ON" file="default_100_percent/linux-radio-disabled-on.png" type="BINDATA" /> - <include name="IDR_RADIO_OFF" file="default_100_percent/linux-radio-off.png" type="BINDATA" /> - <include name="IDR_RADIO_ON" file="default_100_percent/linux-radio-on.png" type="BINDATA" /> - <include name="IDR_PROGRESS_BAR" file="default_100_percent/linux-progress-bar.png" type="BINDATA" /> - <include name="IDR_PROGRESS_BORDER_LEFT" file="default_100_percent/linux-progress-border-left.png" type="BINDATA" /> - <include name="IDR_PROGRESS_BORDER_RIGHT" file="default_100_percent/linux-progress-border-right.png" type="BINDATA" /> - <include name="IDR_PROGRESS_VALUE" file="default_100_percent/linux-progress-value.png" type="BINDATA" /> - </if> - - <!-- TODO(jamescook): Replace Linux images with Aura-specific ones. --> - <if expr="pp_ifdef('use_aura')"> - <include name="IDR_CHECKBOX_DISABLED_INDETERMINATE" file="default_100_percent/linux-checkbox-disabled-indeterminate.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_DISABLED_OFF" file="default_100_percent/linux-checkbox-disabled-off.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_DISABLED_ON" file="default_100_percent/linux-checkbox-disabled-on.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_INDETERMINATE" file="default_100_percent/linux-checkbox-indeterminate.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_OFF" file="default_100_percent/linux-checkbox-off.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_ON" file="default_100_percent/linux-checkbox-on.png" type="BINDATA" /> - <include name="IDR_RADIO_DISABLED_OFF" file="default_100_percent/linux-radio-disabled-off.png" type="BINDATA" /> - <include name="IDR_RADIO_DISABLED_ON" file="default_100_percent/linux-radio-disabled-on.png" type="BINDATA" /> - <include name="IDR_RADIO_OFF" file="default_100_percent/linux-radio-off.png" type="BINDATA" /> - <include name="IDR_RADIO_ON" file="default_100_percent/linux-radio-on.png" type="BINDATA" /> - <include name="IDR_PROGRESS_BAR" file="default_100_percent/linux-progress-bar.png" type="BINDATA" /> - <include name="IDR_PROGRESS_BORDER_LEFT" file="default_100_percent/linux-progress-border-left.png" type="BINDATA" /> - <include name="IDR_PROGRESS_BORDER_RIGHT" file="default_100_percent/linux-progress-border-right.png" type="BINDATA" /> - <include name="IDR_PROGRESS_VALUE" file="default_100_percent/linux-progress-value.png" type="BINDATA" /> - - <include name="IDR_SCROLL_BASE_CORNER" file="touch_200_percent/scrollbar_base_normal_edge.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_CORNER_H" file="touch_200_percent/scrollbar_base_hover_edge.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_HORIZONTAL_CENTER" file="touch_200_percent/scrollbar_base_horizontal_normal_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_HORIZONTAL_CENTER_H" file="touch_200_percent/scrollbar_base_horizontal_hover_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_HORIZONTAL_LEFT" file="touch_200_percent/scrollbar_base_horizontal_normal_left.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_HORIZONTAL_LEFT_H" file="touch_200_percent/scrollbar_base_horizontal_hover_left.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_HORIZONTAL_RIGHT" file="touch_200_percent/scrollbar_base_horizontal_normal_right.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_HORIZONTAL_RIGHT_H" file="touch_200_percent/scrollbar_base_horizontal_hover_right.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_VERTICAL_BOTTOM" file="touch_200_percent/scrollbar_base_vertical_normal_bottom.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_VERTICAL_BOTTOM_H" file="touch_200_percent/scrollbar_base_vertical_hover_bottom.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_VERTICAL_CENTER" file="touch_200_percent/scrollbar_base_vertical_normal_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_VERTICAL_CENTER_H" file="touch_200_percent/scrollbar_base_vertical_hover_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_VERTICAL_TOP" file="touch_200_percent/scrollbar_base_vertical_normal_top.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_VERTICAL_TOP_H" file="touch_200_percent/scrollbar_base_vertical_hover_top.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_HORIZONTAL_CENTER" file="touch_200_percent/scrollbar_thumb_horizontal_normal_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_HORIZONTAL_CENTER_H" file="touch_200_percent/scrollbar_thumb_horizontal_hover_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_HORIZONTAL_CENTER_P" file="touch_200_percent/scrollbar_thumb_horizontal_pressed_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_HORIZONTAL_LEFT" file="touch_200_percent/scrollbar_thumb_horizontal_normal_left.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_HORIZONTAL_LEFT_H" file="touch_200_percent/scrollbar_thumb_horizontal_hover_left.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_HORIZONTAL_LEFT_P" file="touch_200_percent/scrollbar_thumb_horizontal_pressed_left.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_HORIZONTAL_RIGHT" file="touch_200_percent/scrollbar_thumb_horizontal_normal_right.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_HORIZONTAL_RIGHT_H" file="touch_200_percent/scrollbar_thumb_horizontal_hover_right.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_HORIZONTAL_RIGHT_P" file="touch_200_percent/scrollbar_thumb_horizontal_pressed_right.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_VERTICAL_BOTTOM" file="touch_200_percent/scrollbar_thumb_vertical_normal_bottom.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_VERTICAL_BOTTOM_H" file="touch_200_percent/scrollbar_thumb_vertical_hover_bottom.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_VERTICAL_BOTTOM_P" file="touch_200_percent/scrollbar_thumb_vertical_pressed_bottom.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_VERTICAL_CENTER" file="touch_200_percent/scrollbar_thumb_vertical_normal_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_VERTICAL_CENTER_H" file="touch_200_percent/scrollbar_thumb_vertical_hover_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_VERTICAL_CENTER_P" file="touch_200_percent/scrollbar_thumb_vertical_pressed_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_VERTICAL_TOP" file="touch_200_percent/scrollbar_thumb_vertical_normal_top.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_VERTICAL_TOP_H" file="touch_200_percent/scrollbar_thumb_vertical_hover_top.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_VERTICAL_TOP_P" file="touch_200_percent/scrollbar_thumb_vertical_pressed_top.png" type="BINDATA" /> - </if> - </includes> - </release> -</grit> diff --git a/ui/ui_resources.gypi b/ui/ui_resources.gypi index 6b1e312..78d639e 100644 --- a/ui/ui_resources.gypi +++ b/ui/ui_resources.gypi @@ -22,23 +22,6 @@ 'includes': [ '../build/grit_target.gypi' ], }, { - 'target_name': 'ui_resources_2x', - 'type': 'none', - 'variables': { - 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_2x', - }, - 'actions': [ - { - 'action_name': 'ui_resources_2x', - 'variables': { - 'grit_grd_file': 'resources/ui_resources_2x.grd', - }, - 'includes': [ '../build/grit_action.gypi' ], - }, - ], - 'includes': [ '../build/grit_target.gypi' ], - }, - { 'target_name': 'ui_resources_standard', 'type': 'none', 'variables': { @@ -65,39 +48,5 @@ ], 'includes': [ '../build/grit_target.gypi' ], }, - { - 'target_name': 'ui_resources_touch', - 'type': 'none', - 'variables': { - 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_touch', - }, - 'actions': [ - { - 'action_name': 'ui_resources_touch', - 'variables': { - 'grit_grd_file': 'resources/ui_resources_touch.grd', - }, - 'includes': [ '../build/grit_action.gypi' ], - }, - ], - 'includes': [ '../build/grit_target.gypi' ], - }, - { - 'target_name': 'ui_resources_touch_2x', - 'type': 'none', - 'variables': { - 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_touch_2x', - }, - 'actions': [ - { - 'action_name': 'ui_resources_touch_2x', - 'variables': { - 'grit_grd_file': 'resources/ui_resources_touch_2x.grd', - }, - 'includes': [ '../build/grit_action.gypi' ], - }, - ], - 'includes': [ '../build/grit_target.gypi' ], - }, ], } |