Merge native_theme resources into ui_resources_standard

BUG=124566
TEST=none

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

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

133 files changed, 297 insertions, 150 deletions

diff --git a/ash/ash.gyp b/ash/ash.gyp
index 601b329..79b4092 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -338,7 +338,6 @@
         '../ui/aura/aura.gyp:test_support_aura',
         '../ui/compositor/compositor.gyp:compositor',
         '../ui/compositor/compositor.gyp:compositor_test_support',
-        '../ui/ui.gyp:native_theme_resources',
         '../ui/ui.gyp:ui',
         '../ui/ui.gyp:ui_resources',
         '../ui/ui.gyp:ui_resources_standard',
@@ -410,7 +409,6 @@
         'wm/workspace/workspace_manager_unittest.cc',
         'wm/workspace/workspace_window_resizer_unittest.cc',
 
-        '<(SHARED_INTERMEDIATE_DIR)/ui/native_theme/native_theme_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc',
       ],
@@ -460,7 +458,6 @@
         '../ui/aura/aura.gyp:aura',
         '../ui/compositor/compositor.gyp:compositor',
         '../ui/compositor/compositor.gyp:compositor_test_support',
-        '../ui/ui.gyp:native_theme_resources',
         '../ui/ui.gyp:ui',
         '../ui/ui.gyp:ui_resources',
         '../ui/ui.gyp:ui_resources_standard',
@@ -497,7 +494,6 @@
         'shell/window_type_launcher.h',
         'shell/window_watcher.cc',
         'shell/window_watcher.h',
-        '<(SHARED_INTERMEDIATE_DIR)/ui/native_theme/native_theme_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
         '../content/app/startup_helper_win.cc',
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index c644662..cf5e238 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -101,7 +101,6 @@
                 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
                 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
                 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
-                '<(SHARED_INTERMEDIATE_DIR)/ui/native_theme/native_theme_resources.rc',
                 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
                 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc',
                 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
diff --git a/chrome/chrome_repack_chrome.gypi b/chrome/chrome_repack_chrome.gypi
index 1f0f70a..6ac6632 100644
--- a/chrome/chrome_repack_chrome.gypi
+++ b/chrome/chrome_repack_chrome.gypi
@@ -16,11 +16,6 @@
       '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak',
     ],
     'conditions': [
-      ['OS != "mac" or use_aura==1', {
-        'pak_inputs': [
-          '<(SHARED_INTERMEDIATE_DIR)/ui/native_theme/native_theme_resources.pak',
-        ]
-      }],
       ['enable_extensions==1', {
         'pak_inputs': [
           '<(grit_out_dir)/extensions_api_resources.pak',
diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp
index 9eea912..89538e1 100644
--- a/chrome/chrome_resources.gyp
+++ b/chrome/chrome_resources.gyp
@@ -346,8 +346,8 @@
         '<(DEPTH)/content/content_resources.gyp:content_resources',
         '<(DEPTH)/net/net.gyp:net_resources',
         '<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings',
-        '<(DEPTH)/ui/ui.gyp:native_theme_resources',
         '<(DEPTH)/ui/ui.gyp:ui_resources',
+        '<(DEPTH)/ui/ui.gyp:ui_resources_standard',
         '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
         '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings',
       ],
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index c74c7ec..6f27f31 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -217,13 +217,6 @@
               '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak',
             ],
-            'conditions': [
-              ['OS != "mac"', {
-                'pak_inputs': [
-                  '<(SHARED_INTERMEDIATE_DIR)/ui/native_theme/native_theme_resources.pak',
-                ]
-              }],
-            ],
           },
           'inputs': [
             '<(repack_path)',
diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp
index a9e99a6..ca847b5 100644
--- a/ui/aura/aura.gyp
+++ b/ui/aura/aura.gyp
@@ -16,7 +16,6 @@
         '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../../skia/skia.gyp:skia',
         '../compositor/compositor.gyp:compositor',
-        '../ui.gyp:native_theme_resources',
         '../ui.gyp:ui',
         '../ui.gyp:ui_resources',
         '../ui.gyp:ui_resources_2x',
@@ -207,9 +206,9 @@
         '../../third_party/icu/icu.gyp:icuuc',
         '../compositor/compositor.gyp:compositor',
         '../compositor/compositor.gyp:compositor_test_support',
-        '../ui.gyp:native_theme_resources',
         '../ui.gyp:ui',
         '../ui.gyp:ui_resources',
+        '../ui.gyp:ui_resources_standard',
         'aura',
       ],
       'include_dirs': [
@@ -217,8 +216,8 @@
       ],
       'sources': [
         'demo/demo_main.cc',
-        '<(SHARED_INTERMEDIATE_DIR)/ui/native_theme/native_theme_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
+        '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc',
       ],
     },
     {
@@ -257,9 +256,9 @@
         '../compositor/compositor.gyp:compositor_test_support',
         '../compositor/compositor.gyp:compositor',
         '../gl/gl.gyp:gl',
-        '../ui.gyp:native_theme_resources',
         '../ui.gyp:ui',
         '../ui.gyp:ui_resources',
+        '../ui.gyp:ui_resources_standard',
         'test_support_aura',
         'aura',
       ],
@@ -277,8 +276,8 @@
         'event_filter_unittest.cc',
         'event_unittest.cc',
         'window_unittest.cc',
-        '<(SHARED_INTERMEDIATE_DIR)/ui/native_theme/native_theme_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
+        '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc',
       ],
       'conditions': [
         # osmesa GL implementation is used on linux.
diff --git a/ui/base/native_theme/native_theme_android.cc b/ui/base/native_theme/native_theme_android.cc
index 9a95390..89f5bae 100644
--- a/ui/base/native_theme/native_theme_android.cc
+++ b/ui/base/native_theme/native_theme_android.cc
@@ -8,7 +8,7 @@
 
 #include "base/basictypes.h"
 #include "base/logging.h"
-#include "grit/native_theme_resources.h"
+#include "grit/ui_resources_standard.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
diff --git a/ui/base/native_theme/native_theme_aura.cc b/ui/base/native_theme/native_theme_aura.cc
index ce36e63..613eb96 100644
--- a/ui/base/native_theme/native_theme_aura.cc
+++ b/ui/base/native_theme/native_theme_aura.cc
@@ -5,7 +5,7 @@
 #include "ui/base/native_theme/native_theme_aura.h"
 
 #include "base/logging.h"
-#include "grit/native_theme_resources.h"
+#include "grit/ui_resources_standard.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/rect.h"
diff --git a/ui/base/native_theme/native_theme_base.cc b/ui/base/native_theme/native_theme_base.cc
index b79c0fa..d8d3d6f 100644
--- a/ui/base/native_theme/native_theme_base.cc
+++ b/ui/base/native_theme/native_theme_base.cc
@@ -7,7 +7,7 @@
 #include <limits>
 
 #include "base/logging.h"
-#include "grit/native_theme_resources.h"
+#include "grit/ui_resources_standard.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
diff --git a/ui/base/native_theme/resources/native_theme_resources.grd b/ui/base/native_theme/resources/native_theme_resources.grd
deleted file mode 100644
index 11f08ef..0000000
--- a/ui/base/native_theme/resources/native_theme_resources.grd
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grit latest_public_release="0" current_release="1">
-  <outputs>
-    <output filename="grit/native_theme_resources.h" type="rc_header">
-      <emit emit_type='prepend'></emit>
-    </output>
-    <output filename="grit/native_theme_resources_map.cc" type="resource_map_source" />
-    <output filename="grit/native_theme_resources_map.h" type="resource_map_header" />
-    <!-- TODO(oshima): Remove gfx_resources.pak once DumpRenderTree.gyp
-         is updated. -->
-    <output filename="gfx_resources.pak" type="data_package" />
-    <output filename="native_theme_resources.pak" type="data_package" />
-    <output filename="native_theme_resources.rc" type="rc_all" />
-  </outputs>
-  <release seq="1">
-    <includes>
-      <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_hot_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_hot_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_hot_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_hot_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_hot_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_hot_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_hot_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_hot_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_hot_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_hot_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_hot_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_hot_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_hot_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/base/native_theme/resources/default_100_percent/linux-checkbox-disabled-indeterminate.png b/ui/resources/default_100_percent/linux-checkbox-disabled-indeterminate.png
index 171d001..171d001 100644
--- a/ui/base/native_theme/resources/default_100_percent/linux-checkbox-disabled-indeterminate.png
+++ b/ui/resources/default_100_percent/linux-checkbox-disabled-indeterminate.png
diff --git a/ui/base/native_theme/resources/default_100_percent/linux-checkbox-disabled-off.png b/ui/resources/default_100_percent/linux-checkbox-disabled-off.png
index c916674..c916674 100644
--- a/ui/base/native_theme/resources/default_100_percent/linux-checkbox-disabled-off.png
+++ b/ui/resources/default_100_percent/linux-checkbox-disabled-off.png
diff --git a/ui/base/native_theme/resources/default_100_percent/linux-checkbox-disabled-on.png b/ui/resources/default_100_percent/linux-checkbox-disabled-on.png
index d9ff1c6..d9ff1c6 100644
--- a/ui/base/native_theme/resources/default_100_percent/linux-checkbox-disabled-on.png
+++ b/ui/resources/default_100_percent/linux-checkbox-disabled-on.png
diff --git a/ui/base/native_theme/resources/default_100_percent/linux-checkbox-indeterminate.png b/ui/resources/default_100_percent/linux-checkbox-indeterminate.png
index dcde3c1..dcde3c1 100644
--- a/ui/base/native_theme/resources/default_100_percent/linux-checkbox-indeterminate.png
+++ b/ui/resources/default_100_percent/linux-checkbox-indeterminate.png
diff --git a/ui/base/native_theme/resources/default_100_percent/linux-checkbox-off.png b/ui/resources/default_100_percent/linux-checkbox-off.png
index 15cc949..15cc949 100644
--- a/ui/base/native_theme/resources/default_100_percent/linux-checkbox-off.png
+++ b/ui/resources/default_100_percent/linux-checkbox-off.png
diff --git a/ui/base/native_theme/resources/default_100_percent/linux-checkbox-on.png b/ui/resources/default_100_percent/linux-checkbox-on.png
index 4c72e8a..4c72e8a 100644
--- a/ui/base/native_theme/resources/default_100_percent/linux-checkbox-on.png
+++ b/ui/resources/default_100_percent/linux-checkbox-on.png
diff --git a/ui/base/native_theme/resources/default_100_percent/linux-progress-bar.png b/ui/resources/default_100_percent/linux-progress-bar.png
index 82a20f5..82a20f5 100644
--- a/ui/base/native_theme/resources/default_100_percent/linux-progress-bar.png
+++ b/ui/resources/default_100_percent/linux-progress-bar.png
diff --git a/ui/base/native_theme/resources/default_100_percent/linux-progress-border-left.png b/ui/resources/default_100_percent/linux-progress-border-left.png
index 0dd0e50..0dd0e50 100644
--- a/ui/base/native_theme/resources/default_100_percent/linux-progress-border-left.png
+++ b/ui/resources/default_100_percent/linux-progress-border-left.png
diff --git a/ui/base/native_theme/resources/default_100_percent/linux-progress-border-right.png b/ui/resources/default_100_percent/linux-progress-border-right.png
index d351b11..d351b11 100644
--- a/ui/base/native_theme/resources/default_100_percent/linux-progress-border-right.png
+++ b/ui/resources/default_100_percent/linux-progress-border-right.png
diff --git a/ui/base/native_theme/resources/default_100_percent/linux-progress-value.png b/ui/resources/default_100_percent/linux-progress-value.png
index 251917b..251917b 100644
--- a/ui/base/native_theme/resources/default_100_percent/linux-progress-value.png
+++ b/ui/resources/default_100_percent/linux-progress-value.png
diff --git a/ui/base/native_theme/resources/default_100_percent/linux-radio-disabled-off.png b/ui/resources/default_100_percent/linux-radio-disabled-off.png
index 97aa6f9..97aa6f9 100644
--- a/ui/base/native_theme/resources/default_100_percent/linux-radio-disabled-off.png
+++ b/ui/resources/default_100_percent/linux-radio-disabled-off.png
diff --git a/ui/base/native_theme/resources/default_100_percent/linux-radio-disabled-on.png b/ui/resources/default_100_percent/linux-radio-disabled-on.png
index 07aed36..07aed36 100644
--- a/ui/base/native_theme/resources/default_100_percent/linux-radio-disabled-on.png
+++ b/ui/resources/default_100_percent/linux-radio-disabled-on.png
diff --git a/ui/base/native_theme/resources/default_100_percent/linux-radio-off.png b/ui/resources/default_100_percent/linux-radio-off.png
index 6a60a70..6a60a70 100644
--- a/ui/base/native_theme/resources/default_100_percent/linux-radio-off.png
+++ b/ui/resources/default_100_percent/linux-radio-off.png
diff --git a/ui/base/native_theme/resources/default_100_percent/linux-radio-on.png b/ui/resources/default_100_percent/linux-radio-on.png
index cb47411..cb47411 100644
--- a/ui/base/native_theme/resources/default_100_percent/linux-radio-on.png
+++ b/ui/resources/default_100_percent/linux-radio-on.png
diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_horizontal_hot_center.png b/ui/resources/default_100_percent/scrollbar_base_horizontal_hover_center.png
index b285e48..b285e48 100644
--- a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_horizontal_hot_center.png
+++ b/ui/resources/default_100_percent/scrollbar_base_horizontal_hover_center.png
diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_horizontal_hot_left.png b/ui/resources/default_100_percent/scrollbar_base_horizontal_hover_left.png
index 00a536e..00a536e 100644
--- a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_horizontal_hot_left.png
+++ b/ui/resources/default_100_percent/scrollbar_base_horizontal_hover_left.png
diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_horizontal_hot_right.png b/ui/resources/default_100_percent/scrollbar_base_horizontal_hover_right.png
index f9658fc..f9658fc 100644
--- a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_horizontal_hot_right.png
+++ b/ui/resources/default_100_percent/scrollbar_base_horizontal_hover_right.png
diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_horizontal_normal_center.png b/ui/resources/default_100_percent/scrollbar_base_horizontal_normal_center.png
index 23dd2b8..23dd2b8 100644
--- a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_horizontal_normal_center.png
+++ b/ui/resources/default_100_percent/scrollbar_base_horizontal_normal_center.png
diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_horizontal_normal_left.png b/ui/resources/default_100_percent/scrollbar_base_horizontal_normal_left.png
index daa1d16..daa1d16 100644
--- a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_horizontal_normal_left.png
+++ b/ui/resources/default_100_percent/scrollbar_base_horizontal_normal_left.png
diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_horizontal_normal_right.png b/ui/resources/default_100_percent/scrollbar_base_horizontal_normal_right.png
index f7facdd..f7facdd 100644
--- a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_horizontal_normal_right.png
+++ b/ui/resources/default_100_percent/scrollbar_base_horizontal_normal_right.png
diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_hot_edge.png b/ui/resources/default_100_percent/scrollbar_base_hover_edge.png
index 9970962..9970962 100644
--- a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_hot_edge.png
+++ b/ui/resources/default_100_percent/scrollbar_base_hover_edge.png
diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_normal_edge.png b/ui/resources/default_100_percent/scrollbar_base_normal_edge.png
index 84ded01..84ded01 100644
--- a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_normal_edge.png
+++ b/ui/resources/default_100_percent/scrollbar_base_normal_edge.png
diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_vertical_hot_bottom.png b/ui/resources/default_100_percent/scrollbar_base_vertical_hover_bottom.png
index 5ce339d..5ce339d 100644
--- a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_vertical_hot_bottom.png
+++ b/ui/resources/default_100_percent/scrollbar_base_vertical_hover_bottom.png
diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_vertical_hot_center.png b/ui/resources/default_100_percent/scrollbar_base_vertical_hover_center.png
index cbe8595..cbe8595 100644
--- a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_vertical_hot_center.png
+++ b/ui/resources/default_100_percent/scrollbar_base_vertical_hover_center.png
diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_vertical_hot_top.png b/ui/resources/default_100_percent/scrollbar_base_vertical_hover_top.png
index 3b75a91..3b75a91 100644
--- a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_vertical_hot_top.png
+++ b/ui/resources/default_100_percent/scrollbar_base_vertical_hover_top.png
diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_vertical_normal_bottom.png b/ui/resources/default_100_percent/scrollbar_base_vertical_normal_bottom.png
index 8198858..8198858 100644
--- a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_vertical_normal_bottom.png
+++ b/ui/resources/default_100_percent/scrollbar_base_vertical_normal_bottom.png
diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_vertical_normal_center.png b/ui/resources/default_100_percent/scrollbar_base_vertical_normal_center.png
index d567fe1..d567fe1 100644
--- a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_vertical_normal_center.png
+++ b/ui/resources/default_100_percent/scrollbar_base_vertical_normal_center.png
diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_vertical_normal_top.png b/ui/resources/default_100_percent/scrollbar_base_vertical_normal_top.png
index 3139c6e..3139c6e 100644
--- a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_vertical_normal_top.png
+++ b/ui/resources/default_100_percent/scrollbar_base_vertical_normal_top.png
diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_hot_center.png b/ui/resources/default_100_percent/scrollbar_thumb_horizontal_hover_center.png
index adf6b3d..adf6b3d 100644
--- a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_hot_center.png
+++ b/ui/resources/default_100_percent/scrollbar_thumb_horizontal_hover_center.png
diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_hot_left.png b/ui/resources/default_100_percent/scrollbar_thumb_horizontal_hover_left.png
index 77b5437..77b5437 100644
--- a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_hot_left.png
+++ b/ui/resources/default_100_percent/scrollbar_thumb_horizontal_hover_left.png
diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_hot_right.png b/ui/resources/default_100_percent/scrollbar_thumb_horizontal_hover_right.png
index 1ffe6dc..1ffe6dc 100644
--- a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_hot_right.png
+++ b/ui/resources/default_100_percent/scrollbar_thumb_horizontal_hover_right.png
diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_normal_center.png b/ui/resources/default_100_percent/scrollbar_thumb_horizontal_normal_center.png
index faa4c5a..faa4c5a 100644
--- a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_normal_center.png
+++ b/ui/resources/default_100_percent/scrollbar_thumb_horizontal_normal_center.png
diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_normal_left.png b/ui/resources/default_100_percent/scrollbar_thumb_horizontal_normal_left.png
index 8b9cd30..8b9cd30 100644
--- a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_normal_left.png
+++ b/ui/resources/default_100_percent/scrollbar_thumb_horizontal_normal_left.png
diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_normal_right.png b/ui/resources/default_100_percent/scrollbar_thumb_horizontal_normal_right.png
index 47ea6fd..47ea6fd 100644
--- a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_normal_right.png
+++ b/ui/resources/default_100_percent/scrollbar_thumb_horizontal_normal_right.png
diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_pressed_center.png b/ui/resources/default_100_percent/scrollbar_thumb_horizontal_pressed_center.png
index b489ee9..b489ee9 100644
--- a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_pressed_center.png
+++ b/ui/resources/default_100_percent/scrollbar_thumb_horizontal_pressed_center.png
diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_pressed_left.png b/ui/resources/default_100_percent/scrollbar_thumb_horizontal_pressed_left.png
index 2871028..2871028 100644
--- a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_pressed_left.png
+++ b/ui/resources/default_100_percent/scrollbar_thumb_horizontal_pressed_left.png
diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_pressed_right.png b/ui/resources/default_100_percent/scrollbar_thumb_horizontal_pressed_right.png
index 5f46678..5f46678 100644
--- a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_pressed_right.png
+++ b/ui/resources/default_100_percent/scrollbar_thumb_horizontal_pressed_right.png
diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_hot_bottom.png b/ui/resources/default_100_percent/scrollbar_thumb_vertical_hover_bottom.png
index 645dce3..645dce3 100644
--- a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_hot_bottom.png
+++ b/ui/resources/default_100_percent/scrollbar_thumb_vertical_hover_bottom.png
diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_hot_center.png b/ui/resources/default_100_percent/scrollbar_thumb_vertical_hover_center.png
index 667f595..667f595 100644
--- a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_hot_center.png
+++ b/ui/resources/default_100_percent/scrollbar_thumb_vertical_hover_center.png
diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_hot_top.png b/ui/resources/default_100_percent/scrollbar_thumb_vertical_hover_top.png
index 29cb3b2..29cb3b2 100644
--- a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_hot_top.png
+++ b/ui/resources/default_100_percent/scrollbar_thumb_vertical_hover_top.png
diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_normal_bottom.png b/ui/resources/default_100_percent/scrollbar_thumb_vertical_normal_bottom.png
index 02de50b..02de50b 100644
--- a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_normal_bottom.png
+++ b/ui/resources/default_100_percent/scrollbar_thumb_vertical_normal_bottom.png
diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_normal_center.png b/ui/resources/default_100_percent/scrollbar_thumb_vertical_normal_center.png
index 35fb2f3..35fb2f3 100644
--- a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_normal_center.png
+++ b/ui/resources/default_100_percent/scrollbar_thumb_vertical_normal_center.png
diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_normal_top.png b/ui/resources/default_100_percent/scrollbar_thumb_vertical_normal_top.png
index dbf4b76..dbf4b76 100644
--- a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_normal_top.png
+++ b/ui/resources/default_100_percent/scrollbar_thumb_vertical_normal_top.png
diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_pressed_bottom.png b/ui/resources/default_100_percent/scrollbar_thumb_vertical_pressed_bottom.png
index 961e579..961e579 100644
--- a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_pressed_bottom.png
+++ b/ui/resources/default_100_percent/scrollbar_thumb_vertical_pressed_bottom.png
diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_pressed_center.png b/ui/resources/default_100_percent/scrollbar_thumb_vertical_pressed_center.png
index 0d2c710..0d2c710 100644
--- a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_pressed_center.png
+++ b/ui/resources/default_100_percent/scrollbar_thumb_vertical_pressed_center.png
diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_pressed_top.png b/ui/resources/default_100_percent/scrollbar_thumb_vertical_pressed_top.png
index 145cd8c..145cd8c 100644
--- a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_pressed_top.png
+++ b/ui/resources/default_100_percent/scrollbar_thumb_vertical_pressed_top.png
diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_horizontal_hover_center.png b/ui/resources/touch_100_percent/scrollbar_base_horizontal_hover_center.png
index 266b471..266b471 100644
--- a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_horizontal_hover_center.png
+++ b/ui/resources/touch_100_percent/scrollbar_base_horizontal_hover_center.png
diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_horizontal_hover_left.png b/ui/resources/touch_100_percent/scrollbar_base_horizontal_hover_left.png
index a2a55a1..a2a55a1 100644
--- a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_horizontal_hover_left.png
+++ b/ui/resources/touch_100_percent/scrollbar_base_horizontal_hover_left.png
diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_horizontal_hover_right.png b/ui/resources/touch_100_percent/scrollbar_base_horizontal_hover_right.png
index c3bf637..c3bf637 100644
--- a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_horizontal_hover_right.png
+++ b/ui/resources/touch_100_percent/scrollbar_base_horizontal_hover_right.png
diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_horizontal_hover_right_fix.png b/ui/resources/touch_100_percent/scrollbar_base_horizontal_hover_right_fix.png
index 3cc77f3..3cc77f3 100644
--- a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_horizontal_hover_right_fix.png
+++ b/ui/resources/touch_100_percent/scrollbar_base_horizontal_hover_right_fix.png
diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_horizontal_normal_center.png b/ui/resources/touch_100_percent/scrollbar_base_horizontal_normal_center.png
index 2f9a2c7..2f9a2c7 100644
--- a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_horizontal_normal_center.png
+++ b/ui/resources/touch_100_percent/scrollbar_base_horizontal_normal_center.png
diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_horizontal_normal_left.png b/ui/resources/touch_100_percent/scrollbar_base_horizontal_normal_left.png
index 36a4eda..36a4eda 100644
--- a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_horizontal_normal_left.png
+++ b/ui/resources/touch_100_percent/scrollbar_base_horizontal_normal_left.png
diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_horizontal_normal_right.png b/ui/resources/touch_100_percent/scrollbar_base_horizontal_normal_right.png
index 5fe2a1c..5fe2a1c 100644
--- a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_horizontal_normal_right.png
+++ b/ui/resources/touch_100_percent/scrollbar_base_horizontal_normal_right.png
diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_hover_edge.png b/ui/resources/touch_100_percent/scrollbar_base_hover_edge.png
index e6f379d..e6f379d 100644
--- a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_hover_edge.png
+++ b/ui/resources/touch_100_percent/scrollbar_base_hover_edge.png
diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_normal_edge.png b/ui/resources/touch_100_percent/scrollbar_base_normal_edge.png
index 2747ebc..2747ebc 100644
--- a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_normal_edge.png
+++ b/ui/resources/touch_100_percent/scrollbar_base_normal_edge.png
diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_vertical_hover_bottom.png b/ui/resources/touch_100_percent/scrollbar_base_vertical_hover_bottom.png
index fcf9ff8..fcf9ff8 100644
--- a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_vertical_hover_bottom.png
+++ b/ui/resources/touch_100_percent/scrollbar_base_vertical_hover_bottom.png
diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_vertical_hover_bottom_fix.png b/ui/resources/touch_100_percent/scrollbar_base_vertical_hover_bottom_fix.png
index 3820a35..3820a35 100644
--- a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_vertical_hover_bottom_fix.png
+++ b/ui/resources/touch_100_percent/scrollbar_base_vertical_hover_bottom_fix.png
diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_vertical_hover_center.png b/ui/resources/touch_100_percent/scrollbar_base_vertical_hover_center.png
index be18ceb..be18ceb 100644
--- a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_vertical_hover_center.png
+++ b/ui/resources/touch_100_percent/scrollbar_base_vertical_hover_center.png
diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_vertical_hover_top.png b/ui/resources/touch_100_percent/scrollbar_base_vertical_hover_top.png
index 26431ed..26431ed 100644
--- a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_vertical_hover_top.png
+++ b/ui/resources/touch_100_percent/scrollbar_base_vertical_hover_top.png
diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_vertical_normal_bottom.png b/ui/resources/touch_100_percent/scrollbar_base_vertical_normal_bottom.png
index 84d62ed..84d62ed 100644
--- a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_vertical_normal_bottom.png
+++ b/ui/resources/touch_100_percent/scrollbar_base_vertical_normal_bottom.png
diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_vertical_normal_center.png b/ui/resources/touch_100_percent/scrollbar_base_vertical_normal_center.png
index f827c87..f827c87 100644
--- a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_vertical_normal_center.png
+++ b/ui/resources/touch_100_percent/scrollbar_base_vertical_normal_center.png
diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_vertical_normal_top.png b/ui/resources/touch_100_percent/scrollbar_base_vertical_normal_top.png
index 2357970..2357970 100644
--- a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_vertical_normal_top.png
+++ b/ui/resources/touch_100_percent/scrollbar_base_vertical_normal_top.png
diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_hover_center.png b/ui/resources/touch_100_percent/scrollbar_thumb_horizontal_hover_center.png
index 853612f..853612f 100644
--- a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_hover_center.png
+++ b/ui/resources/touch_100_percent/scrollbar_thumb_horizontal_hover_center.png
diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_hover_left.png b/ui/resources/touch_100_percent/scrollbar_thumb_horizontal_hover_left.png
index b08b41a..b08b41a 100644
--- a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_hover_left.png
+++ b/ui/resources/touch_100_percent/scrollbar_thumb_horizontal_hover_left.png
diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_hover_right.png b/ui/resources/touch_100_percent/scrollbar_thumb_horizontal_hover_right.png
index 1c5247a..1c5247a 100644
--- a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_hover_right.png
+++ b/ui/resources/touch_100_percent/scrollbar_thumb_horizontal_hover_right.png
diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_normal_center.png b/ui/resources/touch_100_percent/scrollbar_thumb_horizontal_normal_center.png
index e40aee6..e40aee6 100644
--- a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_normal_center.png
+++ b/ui/resources/touch_100_percent/scrollbar_thumb_horizontal_normal_center.png
diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_normal_left.png b/ui/resources/touch_100_percent/scrollbar_thumb_horizontal_normal_left.png
index d40f6a3..d40f6a3 100644
--- a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_normal_left.png
+++ b/ui/resources/touch_100_percent/scrollbar_thumb_horizontal_normal_left.png
diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_normal_right.png b/ui/resources/touch_100_percent/scrollbar_thumb_horizontal_normal_right.png
index dc35157..dc35157 100644
--- a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_normal_right.png
+++ b/ui/resources/touch_100_percent/scrollbar_thumb_horizontal_normal_right.png
diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_pressed_center.png b/ui/resources/touch_100_percent/scrollbar_thumb_horizontal_pressed_center.png
index af1275a..af1275a 100644
--- a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_pressed_center.png
+++ b/ui/resources/touch_100_percent/scrollbar_thumb_horizontal_pressed_center.png
diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_pressed_left.png b/ui/resources/touch_100_percent/scrollbar_thumb_horizontal_pressed_left.png
index aa3731f..aa3731f 100644
--- a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_pressed_left.png
+++ b/ui/resources/touch_100_percent/scrollbar_thumb_horizontal_pressed_left.png
diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_pressed_right.png b/ui/resources/touch_100_percent/scrollbar_thumb_horizontal_pressed_right.png
index 3ad8021..3ad8021 100644
--- a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_pressed_right.png
+++ b/ui/resources/touch_100_percent/scrollbar_thumb_horizontal_pressed_right.png
diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_hover_bottom.png b/ui/resources/touch_100_percent/scrollbar_thumb_vertical_hover_bottom.png
index 8ecd7f2..8ecd7f2 100644
--- a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_hover_bottom.png
+++ b/ui/resources/touch_100_percent/scrollbar_thumb_vertical_hover_bottom.png
diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_hover_center.png b/ui/resources/touch_100_percent/scrollbar_thumb_vertical_hover_center.png
index d1f1dfc..d1f1dfc 100644
--- a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_hover_center.png
+++ b/ui/resources/touch_100_percent/scrollbar_thumb_vertical_hover_center.png
diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_hover_top.png b/ui/resources/touch_100_percent/scrollbar_thumb_vertical_hover_top.png
index 5ec367c..5ec367c 100644
--- a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_hover_top.png
+++ b/ui/resources/touch_100_percent/scrollbar_thumb_vertical_hover_top.png
diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_normal_bottom.png b/ui/resources/touch_100_percent/scrollbar_thumb_vertical_normal_bottom.png
index 54f2882..54f2882 100644
--- a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_normal_bottom.png
+++ b/ui/resources/touch_100_percent/scrollbar_thumb_vertical_normal_bottom.png
diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_normal_center.png b/ui/resources/touch_100_percent/scrollbar_thumb_vertical_normal_center.png
index 4ca3bb2..4ca3bb2 100644
--- a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_normal_center.png
+++ b/ui/resources/touch_100_percent/scrollbar_thumb_vertical_normal_center.png
diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_normal_top.png b/ui/resources/touch_100_percent/scrollbar_thumb_vertical_normal_top.png
index 8a5e2e5..8a5e2e5 100644
--- a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_normal_top.png
+++ b/ui/resources/touch_100_percent/scrollbar_thumb_vertical_normal_top.png
diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_pressed_bottom.png b/ui/resources/touch_100_percent/scrollbar_thumb_vertical_pressed_bottom.png
index 472e268..472e268 100644
--- a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_pressed_bottom.png
+++ b/ui/resources/touch_100_percent/scrollbar_thumb_vertical_pressed_bottom.png
diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_pressed_center.png b/ui/resources/touch_100_percent/scrollbar_thumb_vertical_pressed_center.png
index 0c2c8f9..0c2c8f9 100644
--- a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_pressed_center.png
+++ b/ui/resources/touch_100_percent/scrollbar_thumb_vertical_pressed_center.png
diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_pressed_top.png b/ui/resources/touch_100_percent/scrollbar_thumb_vertical_pressed_top.png
index 8743981..8743981 100644
--- a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_pressed_top.png
+++ b/ui/resources/touch_100_percent/scrollbar_thumb_vertical_pressed_top.png
diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_horizontal_hover_center.png b/ui/resources/touch_200_percent/scrollbar_base_horizontal_hover_center.png
index a810568..a810568 100644
--- a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_horizontal_hover_center.png
+++ b/ui/resources/touch_200_percent/scrollbar_base_horizontal_hover_center.png
diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_horizontal_hover_left.png b/ui/resources/touch_200_percent/scrollbar_base_horizontal_hover_left.png
index 7b06819..7b06819 100644
--- a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_horizontal_hover_left.png
+++ b/ui/resources/touch_200_percent/scrollbar_base_horizontal_hover_left.png
diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_horizontal_hover_right.png b/ui/resources/touch_200_percent/scrollbar_base_horizontal_hover_right.png
index 8e2973f..8e2973f 100644
--- a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_horizontal_hover_right.png
+++ b/ui/resources/touch_200_percent/scrollbar_base_horizontal_hover_right.png
diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_horizontal_hover_right_fix.png b/ui/resources/touch_200_percent/scrollbar_base_horizontal_hover_right_fix.png
index 8c67fa6..8c67fa6 100644
--- a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_horizontal_hover_right_fix.png
+++ b/ui/resources/touch_200_percent/scrollbar_base_horizontal_hover_right_fix.png
diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_horizontal_normal_center.png b/ui/resources/touch_200_percent/scrollbar_base_horizontal_normal_center.png
index 7fa87c7..7fa87c7 100644
--- a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_horizontal_normal_center.png
+++ b/ui/resources/touch_200_percent/scrollbar_base_horizontal_normal_center.png
diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_horizontal_normal_left.png b/ui/resources/touch_200_percent/scrollbar_base_horizontal_normal_left.png
index d48277f..d48277f 100644
--- a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_horizontal_normal_left.png
+++ b/ui/resources/touch_200_percent/scrollbar_base_horizontal_normal_left.png
diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_horizontal_normal_right.png b/ui/resources/touch_200_percent/scrollbar_base_horizontal_normal_right.png
index 5870e86..5870e86 100644
--- a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_horizontal_normal_right.png
+++ b/ui/resources/touch_200_percent/scrollbar_base_horizontal_normal_right.png
diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_hover_edge.png b/ui/resources/touch_200_percent/scrollbar_base_hover_edge.png
index 8a11695..8a11695 100644
--- a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_hover_edge.png
+++ b/ui/resources/touch_200_percent/scrollbar_base_hover_edge.png
diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_normal_edge.png b/ui/resources/touch_200_percent/scrollbar_base_normal_edge.png
index a997c65..a997c65 100644
--- a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_normal_edge.png
+++ b/ui/resources/touch_200_percent/scrollbar_base_normal_edge.png
diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_vertical_hover_bottom.png b/ui/resources/touch_200_percent/scrollbar_base_vertical_hover_bottom.png
index 1547ddd..1547ddd 100644
--- a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_vertical_hover_bottom.png
+++ b/ui/resources/touch_200_percent/scrollbar_base_vertical_hover_bottom.png
diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_vertical_hover_bottom_fix.png b/ui/resources/touch_200_percent/scrollbar_base_vertical_hover_bottom_fix.png
index 161bc37..161bc37 100644
--- a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_vertical_hover_bottom_fix.png
+++ b/ui/resources/touch_200_percent/scrollbar_base_vertical_hover_bottom_fix.png
diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_vertical_hover_center.png b/ui/resources/touch_200_percent/scrollbar_base_vertical_hover_center.png
index 0aaf4e9..0aaf4e9 100644
--- a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_vertical_hover_center.png
+++ b/ui/resources/touch_200_percent/scrollbar_base_vertical_hover_center.png
diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_vertical_hover_top.png b/ui/resources/touch_200_percent/scrollbar_base_vertical_hover_top.png
index bd9539b..bd9539b 100644
--- a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_vertical_hover_top.png
+++ b/ui/resources/touch_200_percent/scrollbar_base_vertical_hover_top.png
diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_vertical_normal_bottom.png b/ui/resources/touch_200_percent/scrollbar_base_vertical_normal_bottom.png
index fe6ddeb..fe6ddeb 100644
--- a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_vertical_normal_bottom.png
+++ b/ui/resources/touch_200_percent/scrollbar_base_vertical_normal_bottom.png
diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_vertical_normal_center.png b/ui/resources/touch_200_percent/scrollbar_base_vertical_normal_center.png
index 14bfc993..14bfc993 100644
--- a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_vertical_normal_center.png
+++ b/ui/resources/touch_200_percent/scrollbar_base_vertical_normal_center.png
diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_vertical_normal_top.png b/ui/resources/touch_200_percent/scrollbar_base_vertical_normal_top.png
index 66c7a19..66c7a19 100644
--- a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_vertical_normal_top.png
+++ b/ui/resources/touch_200_percent/scrollbar_base_vertical_normal_top.png
diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_hover_center.png b/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_hover_center.png
index cb99e0e..cb99e0e 100644
--- a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_hover_center.png
+++ b/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_hover_center.png
diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_hover_left.png b/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_hover_left.png
index e23a8e3..e23a8e3 100644
--- a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_hover_left.png
+++ b/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_hover_left.png
diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_hover_right.png b/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_hover_right.png
index cad1559..cad1559 100644
--- a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_hover_right.png
+++ b/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_hover_right.png
diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_normal_center.png b/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_normal_center.png
index 7d1a140..7d1a140 100644
--- a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_normal_center.png
+++ b/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_normal_center.png
diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_normal_left.png b/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_normal_left.png
index 5ce29a6..5ce29a6 100644
--- a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_normal_left.png
+++ b/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_normal_left.png
diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_normal_right.png b/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_normal_right.png
index 29dcd84..29dcd84 100644
--- a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_normal_right.png
+++ b/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_normal_right.png
diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_pressed_center.png b/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_pressed_center.png
index 3d6bbe3..3d6bbe3 100644
--- a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_pressed_center.png
+++ b/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_pressed_center.png
diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_pressed_left.png b/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_pressed_left.png
index 8e6c835..8e6c835 100644
--- a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_pressed_left.png
+++ b/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_pressed_left.png
diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_pressed_right.png b/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_pressed_right.png
index 94a1db2..94a1db2 100644
--- a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_pressed_right.png
+++ b/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_pressed_right.png
diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_hover_bottom.png b/ui/resources/touch_200_percent/scrollbar_thumb_vertical_hover_bottom.png
index cd91f17..cd91f17 100644
--- a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_hover_bottom.png
+++ b/ui/resources/touch_200_percent/scrollbar_thumb_vertical_hover_bottom.png
diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_hover_center.png b/ui/resources/touch_200_percent/scrollbar_thumb_vertical_hover_center.png
index e381097..e381097 100644
--- a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_hover_center.png
+++ b/ui/resources/touch_200_percent/scrollbar_thumb_vertical_hover_center.png
diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_hover_top.png b/ui/resources/touch_200_percent/scrollbar_thumb_vertical_hover_top.png
index 4d9532e..4d9532e 100644
--- a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_hover_top.png
+++ b/ui/resources/touch_200_percent/scrollbar_thumb_vertical_hover_top.png
diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_normal_bottom.png b/ui/resources/touch_200_percent/scrollbar_thumb_vertical_normal_bottom.png
index c55365c..c55365c 100644
--- a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_normal_bottom.png
+++ b/ui/resources/touch_200_percent/scrollbar_thumb_vertical_normal_bottom.png
diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_normal_center.png b/ui/resources/touch_200_percent/scrollbar_thumb_vertical_normal_center.png
index d5a805c..d5a805c 100644
--- a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_normal_center.png
+++ b/ui/resources/touch_200_percent/scrollbar_thumb_vertical_normal_center.png
diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_normal_top.png b/ui/resources/touch_200_percent/scrollbar_thumb_vertical_normal_top.png
index dcfe08d..dcfe08d 100644
--- a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_normal_top.png
+++ b/ui/resources/touch_200_percent/scrollbar_thumb_vertical_normal_top.png
diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_pressed_bottom.png b/ui/resources/touch_200_percent/scrollbar_thumb_vertical_pressed_bottom.png
index aa16a4f..aa16a4f 100644
--- a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_pressed_bottom.png
+++ b/ui/resources/touch_200_percent/scrollbar_thumb_vertical_pressed_bottom.png
diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_pressed_center.png b/ui/resources/touch_200_percent/scrollbar_thumb_vertical_pressed_center.png
index 1ee4c9e..1ee4c9e 100644
--- a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_pressed_center.png
+++ b/ui/resources/touch_200_percent/scrollbar_thumb_vertical_pressed_center.png
diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_pressed_top.png b/ui/resources/touch_200_percent/scrollbar_thumb_vertical_pressed_top.png
index 90a0bba..90a0bba 100644
--- a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_pressed_top.png
+++ b/ui/resources/touch_200_percent/scrollbar_thumb_vertical_pressed_top.png
diff --git a/ui/resources/ui_resources_2x.grd b/ui/resources/ui_resources_2x.grd
index 153bd07..2d9533f2 100644
--- a/ui/resources/ui_resources_2x.grd
+++ b/ui/resources/ui_resources_2x.grd
@@ -94,6 +94,73 @@
         <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>
+      <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 4c297e1..0e16607 100644
--- a/ui/resources/ui_resources_standard.grd
+++ b/ui/resources/ui_resources_standard.grd
@@ -6,6 +6,9 @@
     </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" />
+    <!-- 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" />
   </outputs>
@@ -91,6 +94,74 @@
         <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" />
       </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_touch.grd b/ui/resources/ui_resources_touch.grd
index d90ae4c..0eb5c36 100644
--- a/ui/resources/ui_resources_touch.grd
+++ b/ui/resources/ui_resources_touch.grd
@@ -91,6 +91,74 @@
         <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" />
       </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
index 62d7ddb..fac4f81 100644
--- a/ui/resources/ui_resources_touch_2x.grd
+++ b/ui/resources/ui_resources_touch_2x.grd
@@ -91,6 +91,74 @@
         <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>
+
+      <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.gyp b/ui/ui.gyp
index d7b282e..b75dd81 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -30,7 +30,7 @@
         '../third_party/libpng/libpng.gyp:libpng',
         '../third_party/zlib/zlib.gyp:zlib',
         'base/strings/ui_strings.gyp:ui_strings',
-        'native_theme_resources',
+        'ui_resources_standard',
         '<(libjpeg_gyp_path):libjpeg',
       ],
       'defines': [
@@ -685,33 +685,6 @@
         }],
       ],
     },
-    {
-      'target_name': 'native_theme_resources',
-      'type': 'none',
-      'variables': {
-        'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/native_theme',
-      },
-      'actions': [
-        {
-          'action_name': 'native_theme_resources',
-          'variables': {
-            'grit_grd_file': 'base/native_theme/resources/native_theme_resources.grd',
-          },
-          'includes': [ '../build/grit_action.gypi' ],
-        },
-      ],
-      # gfx_resources.pak is used by DumpRenderTree.
-      # TODO(oshima): Update DumpRenderTree.gyp to use new pak file and
-      # remove this.
-      'copies': [ {
-          'destination': '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/',
-          'files' : [
-             '<(SHARED_INTERMEDIATE_DIR)/ui/native_theme/gfx_resources.pak',
-          ],
-        },
-      ],
-      'includes': [ '../build/grit_target.gypi' ],
-    },
   ],
   'conditions': [
     ['inside_chromium_build==1', {
diff --git a/ui/ui_resources.gypi b/ui/ui_resources.gypi
index 092698e..6b1e312 100644
--- a/ui/ui_resources.gypi
+++ b/ui/ui_resources.gypi
@@ -53,6 +53,16 @@
           'includes': [ '../build/grit_action.gypi' ],
         },
       ],
+      # gfx_resources.pak is used by DumpRenderTree.
+      # TODO(oshima): Update DumpRenderTree.gyp to use new pak file and
+      # remove this.
+      'copies': [ {
+          'destination': '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/',
+          'files' : [
+             '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/gfx_resources.pak',
+          ],
+        },
+      ],
       'includes': [ '../build/grit_target.gypi' ],
     },
     {
diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi
index 038d037..628157b 100644
--- a/ui/ui_unittests.gypi
+++ b/ui/ui_unittests.gypi
@@ -39,8 +39,8 @@
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/libpng/libpng.gyp:libpng',
-        'native_theme_resources',
         'ui',
+        'ui_resources_standard',
         'ui_test_support',
       ],
       'sources': [
@@ -98,7 +98,7 @@
         'test/run_all_unittests.cc',
         'test/test_suite.cc',
         'test/test_suite.h',
-        '<(SHARED_INTERMEDIATE_DIR)/ui/native_theme/native_theme_resources.rc',
+        '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc',
       ],
       'include_dirs': [
         '../',
diff --git a/ui/views/views.gyp b/ui/views/views.gyp
index 58c1a39..4be5a1c 100644
--- a/ui/views/views.gyp
+++ b/ui/views/views.gyp
@@ -496,7 +496,6 @@
         '../base/strings/ui_strings.gyp:ui_strings',
         '../compositor/compositor.gyp:compositor',
         '../compositor/compositor.gyp:compositor_test_support',
-        '../ui.gyp:native_theme_resources',
         '../ui.gyp:ui',
         '../ui.gyp:ui_resources',
         '../ui.gyp:ui_resources_standard',
@@ -545,7 +544,6 @@
         'widget/widget_unittest.cc',
         'run_all_unittests.cc',
 
-        '<(SHARED_INTERMEDIATE_DIR)/ui/native_theme/native_theme_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc',
       ],
@@ -599,7 +597,6 @@
         '../../third_party/icu/icu.gyp:icui18n',
         '../../third_party/icu/icu.gyp:icuuc',
         '../ui.gyp:ui',
-        '../ui.gyp:native_theme_resources',
         '../ui.gyp:ui_resources',
         '../ui.gyp:ui_resources_standard',
         'views',
@@ -684,7 +681,6 @@
         '../../third_party/icu/icu.gyp:icui18n',
         '../../third_party/icu/icu.gyp:icuuc',
         '../ui.gyp:ui',
-        '../ui.gyp:native_theme_resources',
         '../ui.gyp:ui_resources',
         '../ui.gyp:ui_resources_standard',
         'views_examples_lib',
@@ -703,7 +699,6 @@
         'examples/examples_main.cc',
         'test/test_views_delegate.cc',
         'test/test_views_delegate.h',
-        '<(SHARED_INTERMEDIATE_DIR)/ui/native_theme/native_theme_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc',
       ],
diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi
index 77c58a1..f717f1c 100644
--- a/webkit/tools/test_shell/test_shell.gypi
+++ b/webkit/tools/test_shell/test_shell.gypi
@@ -174,7 +174,7 @@
               'action_name': 'test_shell_repack',
               'variables': {
                 'pak_inputs': [
-                  '<(SHARED_INTERMEDIATE_DIR)/ui/native_theme/native_theme_resources.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.pak',
                   '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
                   '<(SHARED_INTERMEDIATE_DIR)/test_shell/test_shell_resources.pak',
                   '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
@@ -328,7 +328,7 @@
           ],
         }, { # OS != "mac"
           'dependencies': [
-            '<(DEPTH)/ui/ui.gyp:native_theme_resources',
+            '<(DEPTH)/ui/ui.gyp:ui_resources_standard',
             '<(DEPTH)/net/net.gyp:net_resources',
             '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
             '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings',