Add 2x touch grid file for CrOS

BUG=128555
TEST=Compiles

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138699 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 403 insertions, 0 deletions

diff --git a/chrome/app/theme/theme_resources_touch_2x.grd b/chrome/app/theme/theme_resources_touch_2x.grd
new file mode 100644
index 0000000..7d5fe21
--- /dev/null
+++ b/chrome/app/theme/theme_resources_touch_2x.grd
@@ -0,0 +1,274 @@
+<?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/browser_back_normal.png" type="BINDATA" />
+        <include name="IDR_BACK_D" file="touch_200_percent/browser_back_disabled.png" type="BINDATA" />
+        <include name="IDR_BACK_H" file="touch_200_percent/browser_back_hover.png" type="BINDATA" />
+        <include name="IDR_BACK_P" file="touch_200_percent/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/browser_action_normal.png" type="BINDATA" />
+        <include name="IDR_BROWSER_ACTION_H" file="touch_200_percent/browser_action_hover.png" type="BINDATA" />
+        <include name="IDR_BROWSER_ACTION_P" file="touch_200_percent/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/browser_actions_overflow_normal.png" type="BINDATA" />
+        <include name="IDR_BROWSER_ACTIONS_OVERFLOW_H" file="touch_200_percent/browser_actions_overflow_hover.png" type="BINDATA" />
+        <include name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="touch_200_percent/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/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/browser_forward_normal.png" type="BINDATA" />
+        <include name="IDR_FORWARD_D" file="touch_200_percent/browser_forward_disabled.png" type="BINDATA" />
+        <include name="IDR_FORWARD_H" file="touch_200_percent/browser_forward_hover.png" type="BINDATA" />
+        <include name="IDR_FORWARD_P" file="touch_200_percent/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/browser_home_normal.png" type="BINDATA" />
+        <include name="IDR_HOME_H" file="touch_200_percent/browser_home_hover.png" type="BINDATA" />
+        <include name="IDR_HOME_P" file="touch_200_percent/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/browser_omnibox_middle.png" type="BINDATA" />
+        <include name="IDR_LOCATIONBG_L" file="touch_200_percent/browser_omnibox_left.png" type="BINDATA" />
+        <include name="IDR_LOCATIONBG_R" file="touch_200_percent/browser_omnibox_right.png" type="BINDATA" />
+        <include name="IDR_LOCATION_BAR_BORDER" file="touch_100_percent/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('toolkit_views')">
+        <include name="IDR_NEWTAB_BUTTON" file="touch_200_percent/newtab_normal.png" type="BINDATA" />
+        <include name="IDR_NEWTAB_BUTTON_H" file="touch_200_percent/newtab_hover.png" type="BINDATA" />
+        <include name="IDR_NEWTAB_BUTTON_P" file="touch_200_percent/newtab_pressed.png" type="BINDATA" />
+        <include name="IDR_NEWTAB_BUTTON_MASK" file="touch_200_percent/newtab_button_mask.png" type="BINDATA" />
+      </if>
+      <if expr="not pp_ifdef('toolkit_views')">
+        <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_PLUGIN" file="touch_100_percent/plugin.png" type="BINDATA" />
+      <if expr="pp_ifdef('toolkit_views')">
+        <include name="IDR_RELOAD" file="touch_200_percent/browser_reload_normal.png" type="BINDATA" />
+        <include name="IDR_RELOAD_H" file="touch_200_percent/browser_reload_hover.png" type="BINDATA" />
+        <include name="IDR_RELOAD_P" file="touch_200_percent/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" />
+      <include name="IDR_ACTION_BOX_BUTTON" file="default_100_percent/action_box_button.png" type="BINDATA" />
+      <include name="IDR_ACTION_BOX_BUTTON_H" file="default_100_percent/action_box_button_hover.png" type="BINDATA" />
+      <include name="IDR_ACTION_BOX_BUTTON_P" file="default_100_percent/action_box_button_pressed.png" type="BINDATA" />
+      <if expr="pp_ifdef('toolkit_views')">
+        <include name="IDR_STOP" file="touch_200_percent/browser_stop_normal.png" type="BINDATA" />
+        <include name="IDR_STOP_D" file="touch_200_percent/browser_stop_disabled.png" type="BINDATA" />
+        <include name="IDR_STOP_H" file="touch_200_percent/browser_stop_hover.png" type="BINDATA" />
+        <include name="IDR_STOP_P" file="touch_200_percent/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_200_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_200_percent/tab_active_center.png" type="BINDATA" />
+        <include name="IDR_TAB_ACTIVE_LEFT" file="touch_200_percent/tab_active_left.png" type="BINDATA" />
+        <include name="IDR_TAB_ACTIVE_RIGHT" file="touch_200_percent/tab_active_right.png" type="BINDATA" />
+        <include name="IDR_TAB_ALPHA_LEFT" file="touch_200_percent/tab_alpha_left.png" type="BINDATA" />
+        <include name="IDR_TAB_ALPHA_RIGHT" file="touch_200_percent/tab_alpha_right.png" type="BINDATA" />
+      </if>
+      <if expr="not pp_ifdef('toolkit_views')">
+        <include name="IDR_TAB_ACTIVE_CENTER" file="default_200_percent/tab_active_center.png" type="BINDATA" />
+        <include name="IDR_TAB_ACTIVE_LEFT" file="default_200_percent/tab_active_left.png" type="BINDATA" />
+        <include name="IDR_TAB_ACTIVE_RIGHT" file="default_200_percent/tab_active_right.png" type="BINDATA" />
+        <include name="IDR_TAB_ALPHA_LEFT" file="default_200_percent/tab_alpha_left.png" type="BINDATA" />
+        <include name="IDR_TAB_ALPHA_RIGHT" file="default_200_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/tab_close_normal.png" type="BINDATA" />
+        <include name="IDR_TAB_CLOSE_H" file="touch_200_percent/tab_close_hover.png" type="BINDATA" />
+        <include name="IDR_TAB_CLOSE_MASK" file="touch_200_percent/tab_close_mask.png" type="BINDATA" />
+        <include name="IDR_TAB_CLOSE_P" file="touch_200_percent/tab_close_pressed.png" type="BINDATA" />
+      </if>
+      <if expr="not pp_ifdef('toolkit_views')">
+        <include name="IDR_TAB_CLOSE" file="default_200_percent/tab_close.png" type="BINDATA" />
+        <include name="IDR_TAB_CLOSE_H" file="default_200_percent/tab_close_hover.png" type="BINDATA" />
+        <include name="IDR_TAB_CLOSE_MASK" file="default_200_percent/tab_close_mask.png" type="BINDATA" />
+        <include name="IDR_TAB_CLOSE_P" file="default_200_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_200_percent/tab_inactive_center.png" type="BINDATA" />
+        <include name="IDR_TAB_INACTIVE_LEFT" file="touch_200_percent/tab_inactive_left.png" type="BINDATA" />
+        <include name="IDR_TAB_INACTIVE_RIGHT" file="touch_200_percent/tab_inactive_right.png" type="BINDATA" />
+      </if>
+      <if expr="not pp_ifdef('toolkit_views')">
+        <include name="IDR_TAB_INACTIVE_CENTER" file="default_200_percent/tab_inactive_center.png" type="BINDATA" />
+        <include name="IDR_TAB_INACTIVE_LEFT" file="default_200_percent/tab_inactive_left.png" type="BINDATA" />
+        <include name="IDR_TAB_INACTIVE_RIGHT" file="default_200_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="touch_100_percent/throbber_waiting.png" type="BINDATA" />
+      <if expr="pp_ifdef('toolkit_views')">
+        <include name="IDR_TOOLS" file="touch_200_percent/browser_tools_normal.png" type="BINDATA" />
+        <include name="IDR_TOOLS_H" file="touch_200_percent/browser_tools_hover.png" type="BINDATA" />
+        <include name="IDR_TOOLS_P" file="touch_200_percent/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>
+    </includes>
+  </release>
+</grit>
diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp
index 02d045c..9eea912 100644
--- a/chrome/chrome_resources.gyp
+++ b/chrome/chrome_resources.gyp
@@ -232,6 +232,13 @@
           },
           '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' ],
     },
@@ -243,6 +250,7 @@
         '<(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"', {
@@ -282,7 +290,9 @@
               'destination': '<(PRODUCT_DIR)',
               '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',
               ],
             },
           ],
diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids
index 9006173b..301530b 100644
--- a/tools/gritsettings/resource_ids
+++ b/tools/gritsettings/resource_ids
@@ -154,6 +154,9 @@
   "chrome/app/theme/theme_resources_touch_1x.grd": {
     "includes": [21000],
   },
+  "chrome/app/theme/theme_resources_touch_2x.grd": {
+    "includes": [21000],
+  },
   # This file is generated during the build.
   "chrome/browser/debugger/frontend/devtools_discovery_page_resources.grd": {
     "includes": [21500],
@@ -177,6 +180,9 @@
   "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],
   },
diff --git a/ui/resources/ui_resources_touch_2x.grd b/ui/resources/ui_resources_touch_2x.grd
new file mode 100644
index 0000000..62d7ddb
--- /dev/null
+++ b/ui/resources/ui_resources_touch_2x.grd
@@ -0,0 +1,96 @@
+<?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_200_percent/bubble_shadow_b.png" type="BINDATA" />
+      <include name="IDR_BUBBLE_SHADOW_BL" file="default_200_percent/bubble_shadow_bl.png" type="BINDATA" />
+      <include name="IDR_BUBBLE_SHADOW_BR" file="default_200_percent/bubble_shadow_br.png" type="BINDATA" />
+      <include name="IDR_BUBBLE_SHADOW_L" file="default_200_percent/bubble_shadow_l.png" type="BINDATA" />
+      <include name="IDR_BUBBLE_SHADOW_R" file="default_200_percent/bubble_shadow_r.png" type="BINDATA" />
+      <include name="IDR_BUBBLE_SHADOW_T" file="default_200_percent/bubble_shadow_t.png" type="BINDATA" />
+      <include name="IDR_BUBBLE_SHADOW_TL" file="default_200_percent/bubble_shadow_tl.png" type="BINDATA" />
+      <include name="IDR_BUBBLE_SHADOW_TR" file="default_200_percent/bubble_shadow_tr.png" type="BINDATA" />
+
+      <include name="IDR_CLOSE_BAR" file="close_bar.png" type="BINDATA" />
+      <include name="IDR_CLOSE_BAR_H" file="close_bar_h.png" type="BINDATA" />
+      <include name="IDR_CLOSE_BAR_MASK" file="close_bar_mask.png" type="BINDATA" />
+      <include name="IDR_CLOSE_BAR_P" file="close_bar_p.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/window_button_separator.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_CLOSE" file="touch_200_percent/window_close_normal.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_CLOSE_H" file="touch_200_percent/window_close_hover.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_CLOSE_P" file="touch_200_percent/window_close_pressed.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE" file="touch_200_percent/window_close_normal.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE_H" file="touch_200_percent/window_close_hover.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE_P" file="touch_200_percent/window_close_pressed.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE" file="touch_100_percent/window_restore_normal.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE_H" file="touch_100_percent/window_restore_hover.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE_P" file="touch_100_percent/window_restore_pressed.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_FULLSCREEN_SEPARATOR" file="touch_100_percent/window_button_separator.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZE" file="touch_100_percent/window_maximize_normal.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZE_H" file="touch_100_percent/window_maximize_hover.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZE_P" file="touch_100_percent/window_maximize_pressed.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE" file="touch_200_percent/window_close_normal.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE_H" file="touch_200_percent/window_close_hover.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE_P" file="touch_200_percent/window_close_pressed.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE" file="touch_100_percent/window_maximized_minimize_normal.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE_H" file="touch_100_percent/window_maximized_minimize_hover.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE_P" file="touch_100_percent/window_maximized_minimize_pressed.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_LEFT_P" file="touch_100_percent/window_snap_left_pressed.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_MINIMIZE_P" file="touch_100_percent/window_snap_minimize_pressed.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_P" file="touch_100_percent/window_snap_pressed.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_RIGHT_P" file="touch_100_percent/window_snap_right_pressed.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE" file="touch_100_percent/window_restore_normal.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE_H" file="touch_100_percent/window_restore_hover.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE_P" file="touch_100_percent/window_restore_pressed.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_SNAP_LEFT_P" file="touch_100_percent/window_snap_left_pressed.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_SNAP_MINIMIZE_P" file="touch_100_percent/window_snap_minimize_pressed.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_SNAP_P" file="touch_100_percent/window_snap_pressed.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_SNAP_RIGHT_P" file="touch_100_percent/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_MOVE" 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" />
+      </if>
+    </includes>
+  </release>
+</grit>
diff --git a/ui/ui_resources.gypi b/ui/ui_resources.gypi
index 8b31dcb..092698e 100644
--- a/ui/ui_resources.gypi
+++ b/ui/ui_resources.gypi
@@ -72,5 +72,22 @@
       ],
       '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' ],
+    },
   ],
 }