Use touch friendly window buttons in aura when using --touch-optimized-ui.

I have increased the padding in the assets used for the buttons when running with touch optimized ui enabled.

BUG=115520
TEST=Run with --touch-optimized-ui and verify that maximize and close buttons are large and all assets look correct.


Review URL: http://codereview.chromium.org/10159002

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

16 files changed, 249 insertions, 65 deletions

diff --git a/ash/wm/frame_painter.cc b/ash/wm/frame_painter.cc
index 7fe41ec..5c543da 100644
--- a/ash/wm/frame_painter.cc
+++ b/ash/wm/frame_painter.cc
@@ -9,6 +9,7 @@
 #include "ash/wm/window_util.h"
 #include "base/logging.h"  // DCHECK
 #include "grit/ui_resources.h"
+#include "grit/ui_resources_standard.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPaint.h"
diff --git a/ash/wm/workspace/frame_maximize_button.cc b/ash/wm/workspace/frame_maximize_button.cc
index d4d1d7d..7ea1874 100644
--- a/ash/wm/workspace/frame_maximize_button.cc
+++ b/ash/wm/workspace/frame_maximize_button.cc
@@ -12,6 +12,7 @@
 #include "ash/wm/workspace/snap_sizer.h"
 #include "grit/ash_strings.h"
 #include "grit/ui_resources.h"
+#include "grit/ui_resources_standard.h"
 #include "ui/aura/event.h"
 #include "ui/aura/event_filter.h"
 #include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.cc b/chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.cc
index 148e5cd..054d5d0 100644
--- a/chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.cc
+++ b/chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.cc
@@ -20,6 +20,7 @@
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/canvas.h"
@@ -42,6 +43,9 @@ const int kTabstripLeftSpacing = 0;
 const int kTabstripRightSpacing = 10;
 // Space between top of window and top of tabstrip for restored windows.
 const int kTabstripTopSpacingRestored = 7;
+// Extra space between top of window and top of tabstrip for touch optimized
+// restored windows.
+const int kTabstripTopSpacingTouchOptimized = 17;
 // Space between top of window and top of tabstrip for maximized windows.
 // Place them flush to the top to make them clickable when the cursor is at
 // the screen edge.
@@ -299,6 +303,10 @@ SkBitmap BrowserNonClientFrameViewAsh::GetFaviconForTabIconView() {
 
 int BrowserNonClientFrameViewAsh::NonClientTopBorderHeight(
     bool force_restored) const {
+  if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) {
+    if (force_restored || browser_view()->IsTabStripVisible())
+      return kTabstripTopSpacingTouchOptimized;
+  }
   if (force_restored)
     return kTabstripTopSpacingRestored;
   if (frame()->IsFullscreen())
diff --git a/chrome/browser/ui/views/frame/app_non_client_frame_view_aura.cc b/chrome/browser/ui/views/frame/app_non_client_frame_view_aura.cc
index b6b30c59..64085eb 100644
--- a/chrome/browser/ui/views/frame/app_non_client_frame_view_aura.cc
+++ b/chrome/browser/ui/views/frame/app_non_client_frame_view_aura.cc
@@ -10,6 +10,7 @@
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "grit/generated_resources.h"  // Accessibility names
 #include "grit/ui_resources.h"
+#include "grit/ui_resources_standard.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "ui/aura/window.h"
diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp
index 31de62b..8a515ff 100644
--- a/chrome/chrome_resources.gyp
+++ b/chrome/chrome_resources.gyp
@@ -234,8 +234,19 @@
         'theme_resources_gen',
         '<(DEPTH)/ui/ui.gyp:ui_resources_2x',
         '<(DEPTH)/ui/ui.gyp:ui_resources_standard',
+        '<(DEPTH)/ui/ui.gyp:ui_resources_touch',
       ],
       'conditions': [
+        ['chromeos==1', {
+          'copies': [
+            {
+              'destination': '<(PRODUCT_DIR)',
+              'files': [
+                '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_touch/ui_resources_touch.pak',
+              ],
+            },
+          ],
+        }],
         ['OS != "mac"', {
           # Copy pak files to the product directory. These files will be picked
           # up by the following installer scripts:
diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids
index 39aa025..fe51a30 100644
--- a/tools/gritsettings/resource_ids
+++ b/tools/gritsettings/resource_ids
@@ -169,6 +169,9 @@
   "ui/resources/ui_resources_standard.grd": {
     "includes": [24000],
   },
+  "ui/resources/ui_resources_touch.grd": {
+    "includes": [24000],
+  },
   "ui/resources/ui_resources_2x.grd": {
     "includes": [24000],
   },
diff --git a/ui/base/layout.cc b/ui/base/layout.cc
index 9dff5c2..8da1fcb 100644
--- a/ui/base/layout.cc
+++ b/ui/base/layout.cc
@@ -7,6 +7,11 @@
 #include "base/basictypes.h"
 #include "build/build_config.h"
 
+#if defined(USE_ASH)
+#include "base/command_line.h"
+#include "ui/base/ui_base_switches.h"
+#endif
+
 #if defined(OS_WIN)
 #include "base/win/metro.h"
 #include <Windows.h>
@@ -19,6 +24,8 @@ namespace ui {
 // Windows.
 DisplayLayout GetDisplayLayout() {
 #if defined(USE_ASH)
+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kTouchOptimizedUI))
+    return LAYOUT_TOUCH;
   return LAYOUT_ASH;
 #elif !defined(OS_WIN)
   return LAYOUT_DESKTOP;
diff --git a/ui/base/resource/resource_bundle_aurax11.cc b/ui/base/resource/resource_bundle_aurax11.cc
index fae2add..3c1f824 100644
--- a/ui/base/resource/resource_bundle_aurax11.cc
+++ b/ui/base/resource/resource_bundle_aurax11.cc
@@ -5,10 +5,35 @@
 #include "ui/base/resource/resource_bundle.h"
 
 #include "base/logging.h"
+#include "base/path_service.h"
+#include "ui/base/layout.h"
+#include "ui/base/ui_base_paths.h"
 #include "ui/gfx/image/image.h"
 
+namespace {
+
+FilePath GetResourcesPakFilePath(const std::string& pak_name) {
+  FilePath path;
+  if (PathService::Get(base::DIR_MODULE, &path))
+    return path.AppendASCII(pak_name.c_str());
+  return FilePath();
+}
+
+}  // namespace
+
 namespace ui {
 
+void ResourceBundle::LoadCommonResources() {
+  AddDataPack(GetResourcesPakFilePath("chrome.pak"));
+  AddDataPack(GetResourcesPakFilePath("theme_resources_standard.pak"));
+
+  if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) {
+    AddDataPack(GetResourcesPakFilePath("ui_resources_touch.pak"));
+  } else {
+    AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"));
+  }
+}
+
 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) {
   // Flipped image is not used on ChromeOS.
   DCHECK_EQ(rtl, RTL_DISABLED);
diff --git a/ui/base/resource/resource_bundle_gtk.cc b/ui/base/resource/resource_bundle_gtk.cc
index ddabaf3..bc4a5cc 100644
--- a/ui/base/resource/resource_bundle_gtk.cc
+++ b/ui/base/resource/resource_bundle_gtk.cc
@@ -7,9 +7,11 @@
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted_memory.h"
+#include "base/path_service.h"
 #include "base/synchronization/lock.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/gtk/scoped_gobject.h"
+#include "ui/base/ui_base_paths.h"
 #include "ui/gfx/image/image.h"
 
 #include <gtk/gtk.h>
@@ -49,8 +51,21 @@ GdkPixbuf* LoadPixbuf(base::RefCountedStaticMemory* data, bool rtl_enabled) {
   }
 }
 
+FilePath GetResourcesPakFilePath(const std::string& pak_name) {
+  FilePath path;
+  if (PathService::Get(base::DIR_MODULE, &path))
+    return path.AppendASCII(pak_name.c_str());
+  return FilePath();
+}
+
 }  // namespace
 
+void ResourceBundle::LoadCommonResources() {
+  AddDataPack(GetResourcesPakFilePath("chrome.pak"));
+  AddDataPack(GetResourcesPakFilePath("theme_resources_standard.pak"));
+  AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"));
+}
+
 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) {
   // Use the negative |resource_id| for the key for BIDI-aware images.
   int key = rtl == RTL_ENABLED ? -resource_id : resource_id;
diff --git a/ui/base/resource/resource_bundle_linux.cc b/ui/base/resource/resource_bundle_linux.cc
deleted file mode 100644
index 5c8d598..0000000
--- a/ui/base/resource/resource_bundle_linux.cc
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ui/base/resource/resource_bundle.h"
-
-#include "base/path_service.h"
-#include "ui/base/ui_base_paths.h"
-
-namespace {
-
-FilePath GetResourcesPakFilePath(const std::string& pak_name) {
-  FilePath path;
-  if (PathService::Get(base::DIR_MODULE, &path))
-    return path.AppendASCII(pak_name.c_str());
-  return FilePath();
-}
-
-}  // namespace
-
-namespace ui {
-
-void ResourceBundle::LoadCommonResources() {
-  AddDataPack(GetResourcesPakFilePath("chrome.pak"));
-  AddDataPack(GetResourcesPakFilePath("theme_resources_standard.pak"));
-  AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"));
-}
-
-}  // namespace ui
diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd
index e18196a..7a20703 100644
--- a/ui/resources/ui_resources.grd
+++ b/ui/resources/ui_resources.grd
@@ -263,18 +263,7 @@
 
       <!-- Remaining images only used by Aura. -->
       <if expr="pp_ifdef('use_aura')">
-        <include name="IDR_AURA_WINDOW_BUTTON_SEPARATOR" file="aura/window_button_separator.png" type="BINDATA" />
         <include name="IDR_AURA_WINDOW_CLOSE_ICON" file="aura/slab_close.png" type="BINDATA" />
-        <include name="IDR_AURA_WINDOW_CLOSE" file="aura/window_close_normal.png" type="BINDATA" />
-        <include name="IDR_AURA_WINDOW_CLOSE_H" file="aura/window_close_hot.png" type="BINDATA" />
-        <include name="IDR_AURA_WINDOW_CLOSE_P" file="aura/window_close_pressed.png" type="BINDATA" />
-        <include name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE" file="aura/window_fullscreen_close_normal.png" type="BINDATA" />
-        <include name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE_H" file="aura/window_fullscreen_close_hot.png" type="BINDATA" />
-        <include name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE_P" file="aura/window_fullscreen_close_pressed.png" type="BINDATA" />
-        <include name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE" file="aura/window_fullscreen_restore_normal.png" type="BINDATA" />
-        <include name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE_H" file="aura/window_fullscreen_restore_hot.png" type="BINDATA" />
-        <include name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE_P" file="aura/window_fullscreen_restore_pressed.png" type="BINDATA" />
-        <include name="IDR_AURA_WINDOW_FULLSCREEN_SEPARATOR" file="aura/window_fullscreen_separator.png" type="BINDATA" />
         <include name="IDR_AURA_WINDOW_FULLSCREEN_SHADOW" file="aura/window_fullscreen_shadow.png" type="BINDATA" />
         <include name="IDR_AURA_WINDOW_HEADER_BASE_ACTIVE" file="aura/window_header_base_active.png" type="BINDATA" />
         <include name="IDR_AURA_WINDOW_HEADER_BASE_INACTIVE" file="aura/window_header_base_inactive.png" type="BINDATA" />
@@ -290,26 +279,6 @@
         <include name="IDR_AURA_WINDOW_HEADER_SHADE_TOP" file="aura/window_header_shade_top.png" type="BINDATA" />
         <include name="IDR_AURA_WINDOW_HEADER_SHADE_TOP_LEFT" file="aura/window_header_shade_top_left.png" type="BINDATA" />
         <include name="IDR_AURA_WINDOW_HEADER_SHADE_TOP_RIGHT" file="aura/window_header_shade_top_right.png" type="BINDATA" />
-        <include name="IDR_AURA_WINDOW_MAXIMIZE" file="aura/window_maximize_normal.png" type="BINDATA" />
-        <include name="IDR_AURA_WINDOW_MAXIMIZE_H" file="aura/window_maximize_hot.png" type="BINDATA" />
-        <include name="IDR_AURA_WINDOW_MAXIMIZE_P" file="aura/window_maximize_pressed.png" type="BINDATA" />
-        <include name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE" file="aura/window_maximized_close_normal.png" type="BINDATA" />
-        <include name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE_H" file="aura/window_maximized_close_hot.png" type="BINDATA" />
-        <include name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE_P" file="aura/window_maximized_close_pressed.png" type="BINDATA" />
-        <include name="IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE" file="aura/window_maximized_minimize_normal.png" type="BINDATA" />
-        <include name="IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE_H" file="aura/window_maximized_minimize_hot.png" type="BINDATA" />
-        <include name="IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE_P" file="aura/window_maximized_minimize_pressed.png" type="BINDATA" />
-        <include name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_LEFT_P" file="aura/window_maximized_snap_left_p.png" type="BINDATA" />
-        <include name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_MINIMIZE_P" file="aura/window_maximized_snap_minimize_p.png" type="BINDATA" />
-        <include name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_P" file="aura/window_maximized_snap_p.png" type="BINDATA" />
-        <include name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_RIGHT_P" file="aura/window_maximized_snap_right_p.png" type="BINDATA" />
-        <include name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE" file="aura/window_maximized_restore_normal.png" type="BINDATA" />
-        <include name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE_H" file="aura/window_maximized_restore_hot.png" type="BINDATA" />
-        <include name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE_P" file="aura/window_maximized_restore_pressed.png" type="BINDATA" />
-        <include name="IDR_AURA_WINDOW_SNAP_LEFT_P" file="aura/window_snap_left_p.png" type="BINDATA" />
-        <include name="IDR_AURA_WINDOW_SNAP_MINIMIZE_P" file="aura/window_snap_minimize_p.png" type="BINDATA" />
-        <include name="IDR_AURA_WINDOW_SNAP_P" file="aura/window_snap_p.png" type="BINDATA" />
-        <include name="IDR_AURA_WINDOW_SNAP_RIGHT_P" file="aura/window_snap_right_p.png" type="BINDATA" />
         <include name="IDR_AURA_WINDOW_ZOOM_ICON" file="aura/slab_zoom.png" type="BINDATA" />
         <include name="IDR_AURA_UBER_TRAY_VOLUME_LEVELS" file="aura/status_volume_all.png" type="BINDATA" />
         <include name="IDR_AURA_UBER_TRAY_VOLUME_MUTE" file="aura/status_volume_mute.png" type="BINDATA" />
diff --git a/ui/resources/ui_resources_2x.grd b/ui/resources/ui_resources_2x.grd
index f696cd9..fc13cd6 100644
--- a/ui/resources/ui_resources_2x.grd
+++ b/ui/resources/ui_resources_2x.grd
@@ -12,8 +12,9 @@
   <release seq="1">
     <includes>
       <!-- KEEP THESE IN ALPHABETICAL ORDER AND SYNCHRONIZED WITH
-           ui_resources_standard.grd. THIS MEANS THAT EACH ICON IN THIS FILE
-           MUST HAVE AN EQUIVALENT ICON IN THE OTHER FILE.-->
+           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="bubble_b_2x.png" type="BINDATA" />
       <include name="IDR_BUBBLE_BL" file="bubble_bl_2x.png" type="BINDATA" />
       <include name="IDR_BUBBLE_BR" file="bubble_br_2x.png" type="BINDATA" />
@@ -40,6 +41,44 @@
       <include name="IDR_CLOSE_BAR_H" file="close_bar_h_2x.png" type="BINDATA" />
       <include name="IDR_CLOSE_BAR_MASK" file="close_bar_mask_2x.png" type="BINDATA" />
       <include name="IDR_CLOSE_BAR_P" file="close_bar_p_2x.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="aura/window_button_separator.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_CLOSE" file="aura/window_close_normal.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_CLOSE_H" file="aura/window_close_hot.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_CLOSE_P" file="aura/window_close_pressed.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE" file="aura/window_fullscreen_close_normal.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE_H" file="aura/window_fullscreen_close_hot.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE_P" file="aura/window_fullscreen_close_pressed.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE" file="aura/window_fullscreen_restore_normal.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE_H" file="aura/window_fullscreen_restore_hot.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE_P" file="aura/window_fullscreen_restore_pressed.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_FULLSCREEN_SEPARATOR" file="aura/window_fullscreen_separator.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZE" file="aura/window_maximize_normal.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZE_H" file="aura/window_maximize_hot.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZE_P" file="aura/window_maximize_pressed.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE" file="aura/window_maximized_close_normal.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE_H" file="aura/window_maximized_close_hot.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE_P" file="aura/window_maximized_close_pressed.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE" file="aura/window_maximized_minimize_normal.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE_H" file="aura/window_maximized_minimize_hot.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE_P" file="aura/window_maximized_minimize_pressed.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_LEFT_P" file="aura/window_maximized_snap_left_p.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_MINIMIZE_P" file="aura/window_maximized_snap_minimize_p.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_P" file="aura/window_maximized_snap_p.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_RIGHT_P" file="aura/window_maximized_snap_right_p.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE" file="aura/window_maximized_restore_normal.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE_H" file="aura/window_maximized_restore_hot.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE_P" file="aura/window_maximized_restore_pressed.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_SNAP_LEFT_P" file="aura/window_snap_left_p.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_SNAP_MINIMIZE_P" file="aura/window_snap_minimize_p.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_SNAP_P" file="aura/window_snap_p.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_SNAP_RIGHT_P" file="aura/window_snap_right_p.png" type="BINDATA" />
+      </if>
     </includes>
   </release>
 </grit>
diff --git a/ui/resources/ui_resources_standard.grd b/ui/resources/ui_resources_standard.grd
index 32c73a85..926779e 100644
--- a/ui/resources/ui_resources_standard.grd
+++ b/ui/resources/ui_resources_standard.grd
@@ -12,8 +12,9 @@
   <release seq="1">
     <includes>
       <!-- KEEP THESE IN ALPHABETICAL ORDER AND SYNCHRONIZED WITH
-           ui_resources_2x.grd. THIS MEANS THAT EACH ICON IN THIS FILE
-           MUST HAVE AN EQUIVALENT ICON IN THE OTHER FILE.-->
+           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="bubble_b.png" type="BINDATA" />
       <include name="IDR_BUBBLE_BL" file="bubble_bl.png" type="BINDATA" />
       <include name="IDR_BUBBLE_BR" file="bubble_br.png" type="BINDATA" />
@@ -40,6 +41,41 @@
       <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="aura/window_button_separator.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_CLOSE" file="aura/window_close_normal.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_CLOSE_H" file="aura/window_close_hot.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_CLOSE_P" file="aura/window_close_pressed.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE" file="aura/window_fullscreen_close_normal.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE_H" file="aura/window_fullscreen_close_hot.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE_P" file="aura/window_fullscreen_close_pressed.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE" file="aura/window_fullscreen_restore_normal.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE_H" file="aura/window_fullscreen_restore_hot.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE_P" file="aura/window_fullscreen_restore_pressed.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_FULLSCREEN_SEPARATOR" file="aura/window_fullscreen_separator.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZE" file="aura/window_maximize_normal.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZE_H" file="aura/window_maximize_hot.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZE_P" file="aura/window_maximize_pressed.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE" file="aura/window_maximized_close_normal.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE_H" file="aura/window_maximized_close_hot.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE_P" file="aura/window_maximized_close_pressed.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE" file="aura/window_maximized_minimize_normal.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE_H" file="aura/window_maximized_minimize_hot.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE_P" file="aura/window_maximized_minimize_pressed.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_LEFT_P" file="aura/window_maximized_snap_left_p.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_MINIMIZE_P" file="aura/window_maximized_snap_minimize_p.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_P" file="aura/window_maximized_snap_p.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_RIGHT_P" file="aura/window_maximized_snap_right_p.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE" file="aura/window_maximized_restore_normal.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE_H" file="aura/window_maximized_restore_hot.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE_P" file="aura/window_maximized_restore_pressed.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_SNAP_LEFT_P" file="aura/window_snap_left_p.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_SNAP_MINIMIZE_P" file="aura/window_snap_minimize_p.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_SNAP_P" file="aura/window_snap_p.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_SNAP_RIGHT_P" file="aura/window_snap_right_p.png" type="BINDATA" />
+      </if>
     </includes>
   </release>
 </grit>
diff --git a/ui/resources/ui_resources_touch.grd b/ui/resources/ui_resources_touch.grd
new file mode 100644
index 0000000..59eb2a2c
--- /dev/null
+++ b/ui/resources/ui_resources_touch.grd
@@ -0,0 +1,81 @@
+<?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="bubble_b.png" type="BINDATA" />
+      <include name="IDR_BUBBLE_BL" file="bubble_bl.png" type="BINDATA" />
+      <include name="IDR_BUBBLE_BR" file="bubble_br.png" type="BINDATA" />
+      <include name="IDR_BUBBLE_B_ARROW" file="bubble_pointer_b.png" type="BINDATA" />
+      <include name="IDR_BUBBLE_L" file="bubble_l.png" type="BINDATA" />
+      <include name="IDR_BUBBLE_L_ARROW" file="bubble_pointer_l.png" type="BINDATA" />
+      <include name="IDR_BUBBLE_R" file="bubble_r.png" type="BINDATA" />
+      <include name="IDR_BUBBLE_R_ARROW" file="bubble_pointer_r.png" type="BINDATA" />
+      <include name="IDR_BUBBLE_T" file="bubble_t.png" type="BINDATA" />
+      <include name="IDR_BUBBLE_TL" file="bubble_tl.png" type="BINDATA" />
+      <include name="IDR_BUBBLE_TR" file="bubble_tr.png" type="BINDATA" />
+      <include name="IDR_BUBBLE_T_ARROW" file="bubble_pointer_t.png" type="BINDATA" />
+
+      <include name="IDR_BUBBLE_SHADOW_B" file="bubble_shadow_b.png" type="BINDATA" />
+      <include name="IDR_BUBBLE_SHADOW_BL" file="bubble_shadow_bl.png" type="BINDATA" />
+      <include name="IDR_BUBBLE_SHADOW_BR" file="bubble_shadow_br.png" type="BINDATA" />
+      <include name="IDR_BUBBLE_SHADOW_L" file="bubble_shadow_l.png" type="BINDATA" />
+      <include name="IDR_BUBBLE_SHADOW_R" file="bubble_shadow_r.png" type="BINDATA" />
+      <include name="IDR_BUBBLE_SHADOW_T" file="bubble_shadow_t.png" type="BINDATA" />
+      <include name="IDR_BUBBLE_SHADOW_TL" file="bubble_shadow_tl.png" type="BINDATA" />
+      <include name="IDR_BUBBLE_SHADOW_TR" file="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="aura/window_button_separator_touch.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_CLOSE" file="aura/window_close_touch_normal.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_CLOSE_H" file="aura/window_close_touch_hot.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_CLOSE_P" file="aura/window_close_touch_pressed.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE" file="aura/window_close_touch_normal.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE_H" file="aura/window_close_touch_hot.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE_P" file="aura/window_close_touch_pressed.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE" file="aura/window_restore_touch_normal.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE_H" file="aura/window_restore_touch_hot.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE_P" file="aura/window_restore_touch_pressed.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_FULLSCREEN_SEPARATOR" file="aura/window_button_separator_touch.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZE" file="aura/window_maximize_touch_normal.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZE_H" file="aura/window_maximize_touch_hot.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZE_P" file="aura/window_maximize_touch_pressed.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE" file="aura/window_close_touch_normal.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE_H" file="aura/window_close_touch_hot.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE_P" file="aura/window_close_touch_pressed.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE" file="aura/window_maximized_minimize_touch_normal.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE_H" file="aura/window_maximized_minimize_touch_hot.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE_P" file="aura/window_maximized_minimize_touch_pressed.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_LEFT_P" file="aura/window_snap_left_touch_p.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_MINIMIZE_P" file="aura/window_snap_minimize_touch_p.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_P" file="aura/window_snap_touch_p.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_RIGHT_P" file="aura/window_snap_right_touch_p.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE" file="aura/window_restore_touch_normal.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE_H" file="aura/window_restore_touch_hot.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE_P" file="aura/window_restore_touch_pressed.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_SNAP_LEFT_P" file="aura/window_snap_left_touch_p.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_SNAP_MINIMIZE_P" file="aura/window_snap_minimize_touch_p.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_SNAP_P" file="aura/window_snap_touch_p.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_SNAP_RIGHT_P" file="aura/window_snap_right_touch_p.png" type="BINDATA" />
+      </if>
+    </includes>
+  </release>
+</grit>
diff --git a/ui/ui.gyp b/ui/ui.gyp
index 02f44ac..18f1213 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -221,7 +221,6 @@
         'base/resource/resource_bundle_android.cc',
         'base/resource/resource_bundle_aurax11.cc',
         'base/resource/resource_bundle_gtk.cc',
-        'base/resource/resource_bundle_linux.cc',
         'base/resource/resource_bundle_mac.mm',
         'base/resource/resource_bundle_win.cc',
         'base/resource/resource_bundle_win.h',
diff --git a/ui/ui_resources.gypi b/ui/ui_resources.gypi
index 9aa93cc..8b31dcb 100644
--- a/ui/ui_resources.gypi
+++ b/ui/ui_resources.gypi
@@ -55,5 +55,22 @@
       ],
       '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' ],
+    },
   ],
 }