From b74b4885d8268a943bb9498abbe1d4a288d97f70 Mon Sep 17 00:00:00 2001 From: "oshima@chromium.org" Date: Sat, 26 May 2012 04:29:34 +0000 Subject: 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 --- ash/ash.gyp | 4 - chrome/chrome_dll.gypi | 1 - chrome/chrome_repack_chrome.gypi | 5 -- chrome/chrome_resources.gyp | 2 +- content/content_shell.gypi | 7 -- ui/aura/aura.gyp | 9 +-- ui/base/native_theme/native_theme_android.cc | 2 +- ui/base/native_theme/native_theme_aura.cc | 2 +- ui/base/native_theme/native_theme_base.cc | 2 +- .../linux-checkbox-disabled-indeterminate.png | Bin 3914 -> 0 bytes .../linux-checkbox-disabled-off.png | Bin 2850 -> 0 bytes .../linux-checkbox-disabled-on.png | Bin 3015 -> 0 bytes .../linux-checkbox-indeterminate.png | Bin 3098 -> 0 bytes .../default_100_percent/linux-checkbox-off.png | Bin 3024 -> 0 bytes .../default_100_percent/linux-checkbox-on.png | Bin 3165 -> 0 bytes .../default_100_percent/linux-progress-bar.png | Bin 182 -> 0 bytes .../linux-progress-border-left.png | Bin 148 -> 0 bytes .../linux-progress-border-right.png | Bin 146 -> 0 bytes .../default_100_percent/linux-progress-value.png | Bin 167 -> 0 bytes .../linux-radio-disabled-off.png | Bin 2910 -> 0 bytes .../linux-radio-disabled-on.png | Bin 3015 -> 0 bytes .../default_100_percent/linux-radio-off.png | Bin 3133 -> 0 bytes .../default_100_percent/linux-radio-on.png | Bin 3148 -> 0 bytes .../scrollbar_base_horizontal_hot_center.png | Bin 182 -> 0 bytes .../scrollbar_base_horizontal_hot_left.png | Bin 977 -> 0 bytes .../scrollbar_base_horizontal_hot_right.png | Bin 179 -> 0 bytes .../scrollbar_base_horizontal_normal_center.png | Bin 159 -> 0 bytes .../scrollbar_base_horizontal_normal_left.png | Bin 159 -> 0 bytes .../scrollbar_base_horizontal_normal_right.png | Bin 154 -> 0 bytes .../scrollbar_base_hot_edge.png | Bin 1062 -> 0 bytes .../scrollbar_base_normal_edge.png | Bin 164 -> 0 bytes .../scrollbar_base_vertical_hot_bottom.png | Bin 173 -> 0 bytes .../scrollbar_base_vertical_hot_center.png | Bin 175 -> 0 bytes .../scrollbar_base_vertical_hot_top.png | Bin 945 -> 0 bytes .../scrollbar_base_vertical_normal_bottom.png | Bin 154 -> 0 bytes .../scrollbar_base_vertical_normal_center.png | Bin 158 -> 0 bytes .../scrollbar_base_vertical_normal_top.png | Bin 997 -> 0 bytes .../scrollbar_thumb_horizontal_hot_center.png | Bin 186 -> 0 bytes .../scrollbar_thumb_horizontal_hot_left.png | Bin 981 -> 0 bytes .../scrollbar_thumb_horizontal_hot_right.png | Bin 977 -> 0 bytes .../scrollbar_thumb_horizontal_normal_center.png | Bin 171 -> 0 bytes .../scrollbar_thumb_horizontal_normal_left.png | Bin 1048 -> 0 bytes .../scrollbar_thumb_horizontal_normal_right.png | Bin 1044 -> 0 bytes .../scrollbar_thumb_horizontal_pressed_center.png | Bin 185 -> 0 bytes .../scrollbar_thumb_horizontal_pressed_left.png | Bin 1049 -> 0 bytes .../scrollbar_thumb_horizontal_pressed_right.png | Bin 979 -> 0 bytes .../scrollbar_thumb_vertical_hot_bottom.png | Bin 1042 -> 0 bytes .../scrollbar_thumb_vertical_hot_center.png | Bin 178 -> 0 bytes .../scrollbar_thumb_vertical_hot_top.png | Bin 1045 -> 0 bytes .../scrollbar_thumb_vertical_normal_bottom.png | Bin 1045 -> 0 bytes .../scrollbar_thumb_vertical_normal_center.png | Bin 179 -> 0 bytes .../scrollbar_thumb_vertical_normal_top.png | Bin 1046 -> 0 bytes .../scrollbar_thumb_vertical_pressed_bottom.png | Bin 1045 -> 0 bytes .../scrollbar_thumb_vertical_pressed_center.png | Bin 178 -> 0 bytes .../scrollbar_thumb_vertical_pressed_top.png | Bin 1045 -> 0 bytes .../resources/native_theme_resources.grd | 87 --------------------- .../scrollbar_base_horizontal_hover_center.png | Bin 309 -> 0 bytes .../scrollbar_base_horizontal_hover_left.png | Bin 157 -> 0 bytes .../scrollbar_base_horizontal_hover_right.png | Bin 159 -> 0 bytes .../scrollbar_base_horizontal_hover_right_fix.png | Bin 135 -> 0 bytes .../scrollbar_base_horizontal_normal_center.png | Bin 127 -> 0 bytes .../scrollbar_base_horizontal_normal_left.png | Bin 120 -> 0 bytes .../scrollbar_base_horizontal_normal_right.png | Bin 120 -> 0 bytes .../scrollbar_base_hover_edge.png | Bin 248 -> 0 bytes .../scrollbar_base_normal_edge.png | Bin 129 -> 0 bytes .../scrollbar_base_vertical_hover_bottom.png | Bin 146 -> 0 bytes .../scrollbar_base_vertical_hover_bottom_fix.png | Bin 132 -> 0 bytes .../scrollbar_base_vertical_hover_center.png | Bin 343 -> 0 bytes .../scrollbar_base_vertical_hover_top.png | Bin 137 -> 0 bytes .../scrollbar_base_vertical_normal_bottom.png | Bin 119 -> 0 bytes .../scrollbar_base_vertical_normal_center.png | Bin 128 -> 0 bytes .../scrollbar_base_vertical_normal_top.png | Bin 115 -> 0 bytes .../scrollbar_thumb_horizontal_hover_center.png | Bin 149 -> 0 bytes .../scrollbar_thumb_horizontal_hover_left.png | Bin 167 -> 0 bytes .../scrollbar_thumb_horizontal_hover_right.png | Bin 168 -> 0 bytes .../scrollbar_thumb_horizontal_normal_center.png | Bin 149 -> 0 bytes .../scrollbar_thumb_horizontal_normal_left.png | Bin 166 -> 0 bytes .../scrollbar_thumb_horizontal_normal_right.png | Bin 165 -> 0 bytes .../scrollbar_thumb_horizontal_pressed_center.png | Bin 149 -> 0 bytes .../scrollbar_thumb_horizontal_pressed_left.png | Bin 167 -> 0 bytes .../scrollbar_thumb_horizontal_pressed_right.png | Bin 165 -> 0 bytes .../scrollbar_thumb_vertical_hover_bottom.png | Bin 164 -> 0 bytes .../scrollbar_thumb_vertical_hover_center.png | Bin 147 -> 0 bytes .../scrollbar_thumb_vertical_hover_top.png | Bin 165 -> 0 bytes .../scrollbar_thumb_vertical_normal_bottom.png | Bin 164 -> 0 bytes .../scrollbar_thumb_vertical_normal_center.png | Bin 147 -> 0 bytes .../scrollbar_thumb_vertical_normal_top.png | Bin 162 -> 0 bytes .../scrollbar_thumb_vertical_pressed_bottom.png | Bin 163 -> 0 bytes .../scrollbar_thumb_vertical_pressed_center.png | Bin 147 -> 0 bytes .../scrollbar_thumb_vertical_pressed_top.png | Bin 165 -> 0 bytes .../scrollbar_base_horizontal_hover_center.png | Bin 623 -> 0 bytes .../scrollbar_base_horizontal_hover_left.png | Bin 218 -> 0 bytes .../scrollbar_base_horizontal_hover_right.png | Bin 218 -> 0 bytes .../scrollbar_base_horizontal_hover_right_fix.png | Bin 158 -> 0 bytes .../scrollbar_base_horizontal_normal_center.png | Bin 195 -> 0 bytes .../scrollbar_base_horizontal_normal_left.png | Bin 179 -> 0 bytes .../scrollbar_base_horizontal_normal_right.png | Bin 179 -> 0 bytes .../scrollbar_base_hover_edge.png | Bin 454 -> 0 bytes .../scrollbar_base_normal_edge.png | Bin 213 -> 0 bytes .../scrollbar_base_vertical_hover_bottom.png | Bin 181 -> 0 bytes .../scrollbar_base_vertical_hover_bottom_fix.png | Bin 158 -> 0 bytes .../scrollbar_base_vertical_hover_center.png | Bin 687 -> 0 bytes .../scrollbar_base_vertical_hover_top.png | Bin 168 -> 0 bytes .../scrollbar_base_vertical_normal_bottom.png | Bin 160 -> 0 bytes .../scrollbar_base_vertical_normal_center.png | Bin 206 -> 0 bytes .../scrollbar_base_vertical_normal_top.png | Bin 136 -> 0 bytes .../scrollbar_thumb_horizontal_hover_center.png | Bin 176 -> 0 bytes .../scrollbar_thumb_horizontal_hover_left.png | Bin 211 -> 0 bytes .../scrollbar_thumb_horizontal_hover_right.png | Bin 219 -> 0 bytes .../scrollbar_thumb_horizontal_normal_center.png | Bin 171 -> 0 bytes .../scrollbar_thumb_horizontal_normal_left.png | Bin 211 -> 0 bytes .../scrollbar_thumb_horizontal_normal_right.png | Bin 220 -> 0 bytes .../scrollbar_thumb_horizontal_pressed_center.png | Bin 180 -> 0 bytes .../scrollbar_thumb_horizontal_pressed_left.png | Bin 207 -> 0 bytes .../scrollbar_thumb_horizontal_pressed_right.png | Bin 218 -> 0 bytes .../scrollbar_thumb_vertical_hover_bottom.png | Bin 215 -> 0 bytes .../scrollbar_thumb_vertical_hover_center.png | Bin 181 -> 0 bytes .../scrollbar_thumb_vertical_hover_top.png | Bin 219 -> 0 bytes .../scrollbar_thumb_vertical_normal_bottom.png | Bin 219 -> 0 bytes .../scrollbar_thumb_vertical_normal_center.png | Bin 181 -> 0 bytes .../scrollbar_thumb_vertical_normal_top.png | Bin 218 -> 0 bytes .../scrollbar_thumb_vertical_pressed_bottom.png | Bin 217 -> 0 bytes .../scrollbar_thumb_vertical_pressed_center.png | Bin 180 -> 0 bytes .../scrollbar_thumb_vertical_pressed_top.png | Bin 216 -> 0 bytes .../linux-checkbox-disabled-indeterminate.png | Bin 0 -> 3914 bytes .../linux-checkbox-disabled-off.png | Bin 0 -> 2850 bytes .../linux-checkbox-disabled-on.png | Bin 0 -> 3015 bytes .../linux-checkbox-indeterminate.png | Bin 0 -> 3098 bytes .../default_100_percent/linux-checkbox-off.png | Bin 0 -> 3024 bytes .../default_100_percent/linux-checkbox-on.png | Bin 0 -> 3165 bytes .../default_100_percent/linux-progress-bar.png | Bin 0 -> 182 bytes .../linux-progress-border-left.png | Bin 0 -> 148 bytes .../linux-progress-border-right.png | Bin 0 -> 146 bytes .../default_100_percent/linux-progress-value.png | Bin 0 -> 167 bytes .../linux-radio-disabled-off.png | Bin 0 -> 2910 bytes .../linux-radio-disabled-on.png | Bin 0 -> 3015 bytes .../default_100_percent/linux-radio-off.png | Bin 0 -> 3133 bytes .../default_100_percent/linux-radio-on.png | Bin 0 -> 3148 bytes .../scrollbar_base_horizontal_hover_center.png | Bin 0 -> 182 bytes .../scrollbar_base_horizontal_hover_left.png | Bin 0 -> 977 bytes .../scrollbar_base_horizontal_hover_right.png | Bin 0 -> 179 bytes .../scrollbar_base_horizontal_normal_center.png | Bin 0 -> 159 bytes .../scrollbar_base_horizontal_normal_left.png | Bin 0 -> 159 bytes .../scrollbar_base_horizontal_normal_right.png | Bin 0 -> 154 bytes .../scrollbar_base_hover_edge.png | Bin 0 -> 1062 bytes .../scrollbar_base_normal_edge.png | Bin 0 -> 164 bytes .../scrollbar_base_vertical_hover_bottom.png | Bin 0 -> 173 bytes .../scrollbar_base_vertical_hover_center.png | Bin 0 -> 175 bytes .../scrollbar_base_vertical_hover_top.png | Bin 0 -> 945 bytes .../scrollbar_base_vertical_normal_bottom.png | Bin 0 -> 154 bytes .../scrollbar_base_vertical_normal_center.png | Bin 0 -> 158 bytes .../scrollbar_base_vertical_normal_top.png | Bin 0 -> 997 bytes .../scrollbar_thumb_horizontal_hover_center.png | Bin 0 -> 186 bytes .../scrollbar_thumb_horizontal_hover_left.png | Bin 0 -> 981 bytes .../scrollbar_thumb_horizontal_hover_right.png | Bin 0 -> 977 bytes .../scrollbar_thumb_horizontal_normal_center.png | Bin 0 -> 171 bytes .../scrollbar_thumb_horizontal_normal_left.png | Bin 0 -> 1048 bytes .../scrollbar_thumb_horizontal_normal_right.png | Bin 0 -> 1044 bytes .../scrollbar_thumb_horizontal_pressed_center.png | Bin 0 -> 185 bytes .../scrollbar_thumb_horizontal_pressed_left.png | Bin 0 -> 1049 bytes .../scrollbar_thumb_horizontal_pressed_right.png | Bin 0 -> 979 bytes .../scrollbar_thumb_vertical_hover_bottom.png | Bin 0 -> 1042 bytes .../scrollbar_thumb_vertical_hover_center.png | Bin 0 -> 178 bytes .../scrollbar_thumb_vertical_hover_top.png | Bin 0 -> 1045 bytes .../scrollbar_thumb_vertical_normal_bottom.png | Bin 0 -> 1045 bytes .../scrollbar_thumb_vertical_normal_center.png | Bin 0 -> 179 bytes .../scrollbar_thumb_vertical_normal_top.png | Bin 0 -> 1046 bytes .../scrollbar_thumb_vertical_pressed_bottom.png | Bin 0 -> 1045 bytes .../scrollbar_thumb_vertical_pressed_center.png | Bin 0 -> 178 bytes .../scrollbar_thumb_vertical_pressed_top.png | Bin 0 -> 1045 bytes .../scrollbar_base_horizontal_hover_center.png | Bin 0 -> 309 bytes .../scrollbar_base_horizontal_hover_left.png | Bin 0 -> 157 bytes .../scrollbar_base_horizontal_hover_right.png | Bin 0 -> 159 bytes .../scrollbar_base_horizontal_hover_right_fix.png | Bin 0 -> 135 bytes .../scrollbar_base_horizontal_normal_center.png | Bin 0 -> 127 bytes .../scrollbar_base_horizontal_normal_left.png | Bin 0 -> 120 bytes .../scrollbar_base_horizontal_normal_right.png | Bin 0 -> 120 bytes .../scrollbar_base_hover_edge.png | Bin 0 -> 248 bytes .../scrollbar_base_normal_edge.png | Bin 0 -> 129 bytes .../scrollbar_base_vertical_hover_bottom.png | Bin 0 -> 146 bytes .../scrollbar_base_vertical_hover_bottom_fix.png | Bin 0 -> 132 bytes .../scrollbar_base_vertical_hover_center.png | Bin 0 -> 343 bytes .../scrollbar_base_vertical_hover_top.png | Bin 0 -> 137 bytes .../scrollbar_base_vertical_normal_bottom.png | Bin 0 -> 119 bytes .../scrollbar_base_vertical_normal_center.png | Bin 0 -> 128 bytes .../scrollbar_base_vertical_normal_top.png | Bin 0 -> 115 bytes .../scrollbar_thumb_horizontal_hover_center.png | Bin 0 -> 149 bytes .../scrollbar_thumb_horizontal_hover_left.png | Bin 0 -> 167 bytes .../scrollbar_thumb_horizontal_hover_right.png | Bin 0 -> 168 bytes .../scrollbar_thumb_horizontal_normal_center.png | Bin 0 -> 149 bytes .../scrollbar_thumb_horizontal_normal_left.png | Bin 0 -> 166 bytes .../scrollbar_thumb_horizontal_normal_right.png | Bin 0 -> 165 bytes .../scrollbar_thumb_horizontal_pressed_center.png | Bin 0 -> 149 bytes .../scrollbar_thumb_horizontal_pressed_left.png | Bin 0 -> 167 bytes .../scrollbar_thumb_horizontal_pressed_right.png | Bin 0 -> 165 bytes .../scrollbar_thumb_vertical_hover_bottom.png | Bin 0 -> 164 bytes .../scrollbar_thumb_vertical_hover_center.png | Bin 0 -> 147 bytes .../scrollbar_thumb_vertical_hover_top.png | Bin 0 -> 165 bytes .../scrollbar_thumb_vertical_normal_bottom.png | Bin 0 -> 164 bytes .../scrollbar_thumb_vertical_normal_center.png | Bin 0 -> 147 bytes .../scrollbar_thumb_vertical_normal_top.png | Bin 0 -> 162 bytes .../scrollbar_thumb_vertical_pressed_bottom.png | Bin 0 -> 163 bytes .../scrollbar_thumb_vertical_pressed_center.png | Bin 0 -> 147 bytes .../scrollbar_thumb_vertical_pressed_top.png | Bin 0 -> 165 bytes .../scrollbar_base_horizontal_hover_center.png | Bin 0 -> 623 bytes .../scrollbar_base_horizontal_hover_left.png | Bin 0 -> 218 bytes .../scrollbar_base_horizontal_hover_right.png | Bin 0 -> 218 bytes .../scrollbar_base_horizontal_hover_right_fix.png | Bin 0 -> 158 bytes .../scrollbar_base_horizontal_normal_center.png | Bin 0 -> 195 bytes .../scrollbar_base_horizontal_normal_left.png | Bin 0 -> 179 bytes .../scrollbar_base_horizontal_normal_right.png | Bin 0 -> 179 bytes .../scrollbar_base_hover_edge.png | Bin 0 -> 454 bytes .../scrollbar_base_normal_edge.png | Bin 0 -> 213 bytes .../scrollbar_base_vertical_hover_bottom.png | Bin 0 -> 181 bytes .../scrollbar_base_vertical_hover_bottom_fix.png | Bin 0 -> 158 bytes .../scrollbar_base_vertical_hover_center.png | Bin 0 -> 687 bytes .../scrollbar_base_vertical_hover_top.png | Bin 0 -> 168 bytes .../scrollbar_base_vertical_normal_bottom.png | Bin 0 -> 160 bytes .../scrollbar_base_vertical_normal_center.png | Bin 0 -> 206 bytes .../scrollbar_base_vertical_normal_top.png | Bin 0 -> 136 bytes .../scrollbar_thumb_horizontal_hover_center.png | Bin 0 -> 176 bytes .../scrollbar_thumb_horizontal_hover_left.png | Bin 0 -> 211 bytes .../scrollbar_thumb_horizontal_hover_right.png | Bin 0 -> 219 bytes .../scrollbar_thumb_horizontal_normal_center.png | Bin 0 -> 171 bytes .../scrollbar_thumb_horizontal_normal_left.png | Bin 0 -> 211 bytes .../scrollbar_thumb_horizontal_normal_right.png | Bin 0 -> 220 bytes .../scrollbar_thumb_horizontal_pressed_center.png | Bin 0 -> 180 bytes .../scrollbar_thumb_horizontal_pressed_left.png | Bin 0 -> 207 bytes .../scrollbar_thumb_horizontal_pressed_right.png | Bin 0 -> 218 bytes .../scrollbar_thumb_vertical_hover_bottom.png | Bin 0 -> 215 bytes .../scrollbar_thumb_vertical_hover_center.png | Bin 0 -> 181 bytes .../scrollbar_thumb_vertical_hover_top.png | Bin 0 -> 219 bytes .../scrollbar_thumb_vertical_normal_bottom.png | Bin 0 -> 219 bytes .../scrollbar_thumb_vertical_normal_center.png | Bin 0 -> 181 bytes .../scrollbar_thumb_vertical_normal_top.png | Bin 0 -> 218 bytes .../scrollbar_thumb_vertical_pressed_bottom.png | Bin 0 -> 217 bytes .../scrollbar_thumb_vertical_pressed_center.png | Bin 0 -> 180 bytes .../scrollbar_thumb_vertical_pressed_top.png | Bin 0 -> 216 bytes ui/resources/ui_resources_2x.grd | 67 ++++++++++++++++ ui/resources/ui_resources_standard.grd | 71 +++++++++++++++++ ui/resources/ui_resources_touch.grd | 68 ++++++++++++++++ ui/resources/ui_resources_touch_2x.grd | 68 ++++++++++++++++ ui/ui.gyp | 29 +------ ui/ui_resources.gypi | 10 +++ ui/ui_unittests.gypi | 4 +- ui/views/views.gyp | 5 -- webkit/tools/test_shell/test_shell.gypi | 4 +- 247 files changed, 297 insertions(+), 150 deletions(-) delete mode 100644 ui/base/native_theme/resources/default_100_percent/linux-checkbox-disabled-indeterminate.png delete mode 100644 ui/base/native_theme/resources/default_100_percent/linux-checkbox-disabled-off.png delete mode 100644 ui/base/native_theme/resources/default_100_percent/linux-checkbox-disabled-on.png delete mode 100644 ui/base/native_theme/resources/default_100_percent/linux-checkbox-indeterminate.png delete mode 100644 ui/base/native_theme/resources/default_100_percent/linux-checkbox-off.png delete mode 100644 ui/base/native_theme/resources/default_100_percent/linux-checkbox-on.png delete mode 100644 ui/base/native_theme/resources/default_100_percent/linux-progress-bar.png delete mode 100644 ui/base/native_theme/resources/default_100_percent/linux-progress-border-left.png delete mode 100644 ui/base/native_theme/resources/default_100_percent/linux-progress-border-right.png delete mode 100644 ui/base/native_theme/resources/default_100_percent/linux-progress-value.png delete mode 100644 ui/base/native_theme/resources/default_100_percent/linux-radio-disabled-off.png delete mode 100644 ui/base/native_theme/resources/default_100_percent/linux-radio-disabled-on.png delete mode 100644 ui/base/native_theme/resources/default_100_percent/linux-radio-off.png delete mode 100644 ui/base/native_theme/resources/default_100_percent/linux-radio-on.png delete mode 100644 ui/base/native_theme/resources/default_100_percent/scrollbar_base_horizontal_hot_center.png delete mode 100644 ui/base/native_theme/resources/default_100_percent/scrollbar_base_horizontal_hot_left.png delete mode 100644 ui/base/native_theme/resources/default_100_percent/scrollbar_base_horizontal_hot_right.png delete mode 100644 ui/base/native_theme/resources/default_100_percent/scrollbar_base_horizontal_normal_center.png delete mode 100644 ui/base/native_theme/resources/default_100_percent/scrollbar_base_horizontal_normal_left.png delete mode 100644 ui/base/native_theme/resources/default_100_percent/scrollbar_base_horizontal_normal_right.png delete mode 100644 ui/base/native_theme/resources/default_100_percent/scrollbar_base_hot_edge.png delete mode 100644 ui/base/native_theme/resources/default_100_percent/scrollbar_base_normal_edge.png delete mode 100644 ui/base/native_theme/resources/default_100_percent/scrollbar_base_vertical_hot_bottom.png delete mode 100644 ui/base/native_theme/resources/default_100_percent/scrollbar_base_vertical_hot_center.png delete mode 100644 ui/base/native_theme/resources/default_100_percent/scrollbar_base_vertical_hot_top.png delete mode 100644 ui/base/native_theme/resources/default_100_percent/scrollbar_base_vertical_normal_bottom.png delete mode 100644 ui/base/native_theme/resources/default_100_percent/scrollbar_base_vertical_normal_center.png delete mode 100644 ui/base/native_theme/resources/default_100_percent/scrollbar_base_vertical_normal_top.png delete mode 100644 ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_hot_center.png delete mode 100644 ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_hot_left.png delete mode 100644 ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_hot_right.png delete mode 100644 ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_normal_center.png delete mode 100644 ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_normal_left.png delete mode 100644 ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_normal_right.png delete mode 100644 ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_pressed_center.png delete mode 100644 ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_pressed_left.png delete mode 100644 ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_pressed_right.png delete mode 100644 ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_hot_bottom.png delete mode 100644 ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_hot_center.png delete mode 100644 ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_hot_top.png delete mode 100644 ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_normal_bottom.png delete mode 100644 ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_normal_center.png delete mode 100644 ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_normal_top.png delete mode 100644 ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_pressed_bottom.png delete mode 100644 ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_pressed_center.png delete mode 100644 ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_pressed_top.png delete mode 100644 ui/base/native_theme/resources/native_theme_resources.grd delete mode 100644 ui/base/native_theme/resources/touch_100_percent/scrollbar_base_horizontal_hover_center.png delete mode 100644 ui/base/native_theme/resources/touch_100_percent/scrollbar_base_horizontal_hover_left.png delete mode 100644 ui/base/native_theme/resources/touch_100_percent/scrollbar_base_horizontal_hover_right.png delete mode 100644 ui/base/native_theme/resources/touch_100_percent/scrollbar_base_horizontal_hover_right_fix.png delete mode 100644 ui/base/native_theme/resources/touch_100_percent/scrollbar_base_horizontal_normal_center.png delete mode 100644 ui/base/native_theme/resources/touch_100_percent/scrollbar_base_horizontal_normal_left.png delete mode 100644 ui/base/native_theme/resources/touch_100_percent/scrollbar_base_horizontal_normal_right.png delete mode 100644 ui/base/native_theme/resources/touch_100_percent/scrollbar_base_hover_edge.png delete mode 100644 ui/base/native_theme/resources/touch_100_percent/scrollbar_base_normal_edge.png delete mode 100644 ui/base/native_theme/resources/touch_100_percent/scrollbar_base_vertical_hover_bottom.png delete mode 100644 ui/base/native_theme/resources/touch_100_percent/scrollbar_base_vertical_hover_bottom_fix.png delete mode 100644 ui/base/native_theme/resources/touch_100_percent/scrollbar_base_vertical_hover_center.png delete mode 100644 ui/base/native_theme/resources/touch_100_percent/scrollbar_base_vertical_hover_top.png delete mode 100644 ui/base/native_theme/resources/touch_100_percent/scrollbar_base_vertical_normal_bottom.png delete mode 100644 ui/base/native_theme/resources/touch_100_percent/scrollbar_base_vertical_normal_center.png delete mode 100644 ui/base/native_theme/resources/touch_100_percent/scrollbar_base_vertical_normal_top.png delete mode 100644 ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_hover_center.png delete mode 100644 ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_hover_left.png delete mode 100644 ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_hover_right.png delete mode 100644 ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_normal_center.png delete mode 100644 ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_normal_left.png delete mode 100644 ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_normal_right.png delete mode 100644 ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_pressed_center.png delete mode 100644 ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_pressed_left.png delete mode 100644 ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_pressed_right.png delete mode 100644 ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_hover_bottom.png delete mode 100644 ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_hover_center.png delete mode 100644 ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_hover_top.png delete mode 100644 ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_normal_bottom.png delete mode 100644 ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_normal_center.png delete mode 100644 ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_normal_top.png delete mode 100644 ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_pressed_bottom.png delete mode 100644 ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_pressed_center.png delete mode 100644 ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_pressed_top.png delete mode 100644 ui/base/native_theme/resources/touch_200_percent/scrollbar_base_horizontal_hover_center.png delete mode 100644 ui/base/native_theme/resources/touch_200_percent/scrollbar_base_horizontal_hover_left.png delete mode 100644 ui/base/native_theme/resources/touch_200_percent/scrollbar_base_horizontal_hover_right.png delete mode 100644 ui/base/native_theme/resources/touch_200_percent/scrollbar_base_horizontal_hover_right_fix.png delete mode 100644 ui/base/native_theme/resources/touch_200_percent/scrollbar_base_horizontal_normal_center.png delete mode 100644 ui/base/native_theme/resources/touch_200_percent/scrollbar_base_horizontal_normal_left.png delete mode 100644 ui/base/native_theme/resources/touch_200_percent/scrollbar_base_horizontal_normal_right.png delete mode 100644 ui/base/native_theme/resources/touch_200_percent/scrollbar_base_hover_edge.png delete mode 100644 ui/base/native_theme/resources/touch_200_percent/scrollbar_base_normal_edge.png delete mode 100644 ui/base/native_theme/resources/touch_200_percent/scrollbar_base_vertical_hover_bottom.png delete mode 100644 ui/base/native_theme/resources/touch_200_percent/scrollbar_base_vertical_hover_bottom_fix.png delete mode 100644 ui/base/native_theme/resources/touch_200_percent/scrollbar_base_vertical_hover_center.png delete mode 100644 ui/base/native_theme/resources/touch_200_percent/scrollbar_base_vertical_hover_top.png delete mode 100644 ui/base/native_theme/resources/touch_200_percent/scrollbar_base_vertical_normal_bottom.png delete mode 100644 ui/base/native_theme/resources/touch_200_percent/scrollbar_base_vertical_normal_center.png delete mode 100644 ui/base/native_theme/resources/touch_200_percent/scrollbar_base_vertical_normal_top.png delete mode 100644 ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_hover_center.png delete mode 100644 ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_hover_left.png delete mode 100644 ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_hover_right.png delete mode 100644 ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_normal_center.png delete mode 100644 ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_normal_left.png delete mode 100644 ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_normal_right.png delete mode 100644 ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_pressed_center.png delete mode 100644 ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_pressed_left.png delete mode 100644 ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_pressed_right.png delete mode 100644 ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_hover_bottom.png delete mode 100644 ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_hover_center.png delete mode 100644 ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_hover_top.png delete mode 100644 ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_normal_bottom.png delete mode 100644 ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_normal_center.png delete mode 100644 ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_normal_top.png delete mode 100644 ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_pressed_bottom.png delete mode 100644 ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_pressed_center.png delete mode 100644 ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_pressed_top.png create mode 100644 ui/resources/default_100_percent/linux-checkbox-disabled-indeterminate.png create mode 100644 ui/resources/default_100_percent/linux-checkbox-disabled-off.png create mode 100644 ui/resources/default_100_percent/linux-checkbox-disabled-on.png create mode 100644 ui/resources/default_100_percent/linux-checkbox-indeterminate.png create mode 100644 ui/resources/default_100_percent/linux-checkbox-off.png create mode 100644 ui/resources/default_100_percent/linux-checkbox-on.png create mode 100644 ui/resources/default_100_percent/linux-progress-bar.png create mode 100644 ui/resources/default_100_percent/linux-progress-border-left.png create mode 100644 ui/resources/default_100_percent/linux-progress-border-right.png create mode 100644 ui/resources/default_100_percent/linux-progress-value.png create mode 100644 ui/resources/default_100_percent/linux-radio-disabled-off.png create mode 100644 ui/resources/default_100_percent/linux-radio-disabled-on.png create mode 100644 ui/resources/default_100_percent/linux-radio-off.png create mode 100644 ui/resources/default_100_percent/linux-radio-on.png create mode 100644 ui/resources/default_100_percent/scrollbar_base_horizontal_hover_center.png create mode 100644 ui/resources/default_100_percent/scrollbar_base_horizontal_hover_left.png create mode 100644 ui/resources/default_100_percent/scrollbar_base_horizontal_hover_right.png create mode 100644 ui/resources/default_100_percent/scrollbar_base_horizontal_normal_center.png create mode 100644 ui/resources/default_100_percent/scrollbar_base_horizontal_normal_left.png create mode 100644 ui/resources/default_100_percent/scrollbar_base_horizontal_normal_right.png create mode 100644 ui/resources/default_100_percent/scrollbar_base_hover_edge.png create mode 100644 ui/resources/default_100_percent/scrollbar_base_normal_edge.png create mode 100644 ui/resources/default_100_percent/scrollbar_base_vertical_hover_bottom.png create mode 100644 ui/resources/default_100_percent/scrollbar_base_vertical_hover_center.png create mode 100644 ui/resources/default_100_percent/scrollbar_base_vertical_hover_top.png create mode 100644 ui/resources/default_100_percent/scrollbar_base_vertical_normal_bottom.png create mode 100644 ui/resources/default_100_percent/scrollbar_base_vertical_normal_center.png create mode 100644 ui/resources/default_100_percent/scrollbar_base_vertical_normal_top.png create mode 100644 ui/resources/default_100_percent/scrollbar_thumb_horizontal_hover_center.png create mode 100644 ui/resources/default_100_percent/scrollbar_thumb_horizontal_hover_left.png create mode 100644 ui/resources/default_100_percent/scrollbar_thumb_horizontal_hover_right.png create mode 100644 ui/resources/default_100_percent/scrollbar_thumb_horizontal_normal_center.png create mode 100644 ui/resources/default_100_percent/scrollbar_thumb_horizontal_normal_left.png create mode 100644 ui/resources/default_100_percent/scrollbar_thumb_horizontal_normal_right.png create mode 100644 ui/resources/default_100_percent/scrollbar_thumb_horizontal_pressed_center.png create mode 100644 ui/resources/default_100_percent/scrollbar_thumb_horizontal_pressed_left.png create mode 100644 ui/resources/default_100_percent/scrollbar_thumb_horizontal_pressed_right.png create mode 100644 ui/resources/default_100_percent/scrollbar_thumb_vertical_hover_bottom.png create mode 100644 ui/resources/default_100_percent/scrollbar_thumb_vertical_hover_center.png create mode 100644 ui/resources/default_100_percent/scrollbar_thumb_vertical_hover_top.png create mode 100644 ui/resources/default_100_percent/scrollbar_thumb_vertical_normal_bottom.png create mode 100644 ui/resources/default_100_percent/scrollbar_thumb_vertical_normal_center.png create mode 100644 ui/resources/default_100_percent/scrollbar_thumb_vertical_normal_top.png create mode 100644 ui/resources/default_100_percent/scrollbar_thumb_vertical_pressed_bottom.png create mode 100644 ui/resources/default_100_percent/scrollbar_thumb_vertical_pressed_center.png create mode 100644 ui/resources/default_100_percent/scrollbar_thumb_vertical_pressed_top.png create mode 100644 ui/resources/touch_100_percent/scrollbar_base_horizontal_hover_center.png create mode 100644 ui/resources/touch_100_percent/scrollbar_base_horizontal_hover_left.png create mode 100644 ui/resources/touch_100_percent/scrollbar_base_horizontal_hover_right.png create mode 100644 ui/resources/touch_100_percent/scrollbar_base_horizontal_hover_right_fix.png create mode 100644 ui/resources/touch_100_percent/scrollbar_base_horizontal_normal_center.png create mode 100644 ui/resources/touch_100_percent/scrollbar_base_horizontal_normal_left.png create mode 100644 ui/resources/touch_100_percent/scrollbar_base_horizontal_normal_right.png create mode 100644 ui/resources/touch_100_percent/scrollbar_base_hover_edge.png create mode 100644 ui/resources/touch_100_percent/scrollbar_base_normal_edge.png create mode 100644 ui/resources/touch_100_percent/scrollbar_base_vertical_hover_bottom.png create mode 100644 ui/resources/touch_100_percent/scrollbar_base_vertical_hover_bottom_fix.png create mode 100644 ui/resources/touch_100_percent/scrollbar_base_vertical_hover_center.png create mode 100644 ui/resources/touch_100_percent/scrollbar_base_vertical_hover_top.png create mode 100644 ui/resources/touch_100_percent/scrollbar_base_vertical_normal_bottom.png create mode 100644 ui/resources/touch_100_percent/scrollbar_base_vertical_normal_center.png create mode 100644 ui/resources/touch_100_percent/scrollbar_base_vertical_normal_top.png create mode 100644 ui/resources/touch_100_percent/scrollbar_thumb_horizontal_hover_center.png create mode 100644 ui/resources/touch_100_percent/scrollbar_thumb_horizontal_hover_left.png create mode 100644 ui/resources/touch_100_percent/scrollbar_thumb_horizontal_hover_right.png create mode 100644 ui/resources/touch_100_percent/scrollbar_thumb_horizontal_normal_center.png create mode 100644 ui/resources/touch_100_percent/scrollbar_thumb_horizontal_normal_left.png create mode 100644 ui/resources/touch_100_percent/scrollbar_thumb_horizontal_normal_right.png create mode 100644 ui/resources/touch_100_percent/scrollbar_thumb_horizontal_pressed_center.png create mode 100644 ui/resources/touch_100_percent/scrollbar_thumb_horizontal_pressed_left.png create mode 100644 ui/resources/touch_100_percent/scrollbar_thumb_horizontal_pressed_right.png create mode 100644 ui/resources/touch_100_percent/scrollbar_thumb_vertical_hover_bottom.png create mode 100644 ui/resources/touch_100_percent/scrollbar_thumb_vertical_hover_center.png create mode 100644 ui/resources/touch_100_percent/scrollbar_thumb_vertical_hover_top.png create mode 100644 ui/resources/touch_100_percent/scrollbar_thumb_vertical_normal_bottom.png create mode 100644 ui/resources/touch_100_percent/scrollbar_thumb_vertical_normal_center.png create mode 100644 ui/resources/touch_100_percent/scrollbar_thumb_vertical_normal_top.png create mode 100644 ui/resources/touch_100_percent/scrollbar_thumb_vertical_pressed_bottom.png create mode 100644 ui/resources/touch_100_percent/scrollbar_thumb_vertical_pressed_center.png create mode 100644 ui/resources/touch_100_percent/scrollbar_thumb_vertical_pressed_top.png create mode 100644 ui/resources/touch_200_percent/scrollbar_base_horizontal_hover_center.png create mode 100644 ui/resources/touch_200_percent/scrollbar_base_horizontal_hover_left.png create mode 100644 ui/resources/touch_200_percent/scrollbar_base_horizontal_hover_right.png create mode 100644 ui/resources/touch_200_percent/scrollbar_base_horizontal_hover_right_fix.png create mode 100644 ui/resources/touch_200_percent/scrollbar_base_horizontal_normal_center.png create mode 100644 ui/resources/touch_200_percent/scrollbar_base_horizontal_normal_left.png create mode 100644 ui/resources/touch_200_percent/scrollbar_base_horizontal_normal_right.png create mode 100644 ui/resources/touch_200_percent/scrollbar_base_hover_edge.png create mode 100644 ui/resources/touch_200_percent/scrollbar_base_normal_edge.png create mode 100644 ui/resources/touch_200_percent/scrollbar_base_vertical_hover_bottom.png create mode 100644 ui/resources/touch_200_percent/scrollbar_base_vertical_hover_bottom_fix.png create mode 100644 ui/resources/touch_200_percent/scrollbar_base_vertical_hover_center.png create mode 100644 ui/resources/touch_200_percent/scrollbar_base_vertical_hover_top.png create mode 100644 ui/resources/touch_200_percent/scrollbar_base_vertical_normal_bottom.png create mode 100644 ui/resources/touch_200_percent/scrollbar_base_vertical_normal_center.png create mode 100644 ui/resources/touch_200_percent/scrollbar_base_vertical_normal_top.png create mode 100644 ui/resources/touch_200_percent/scrollbar_thumb_horizontal_hover_center.png create mode 100644 ui/resources/touch_200_percent/scrollbar_thumb_horizontal_hover_left.png create mode 100644 ui/resources/touch_200_percent/scrollbar_thumb_horizontal_hover_right.png create mode 100644 ui/resources/touch_200_percent/scrollbar_thumb_horizontal_normal_center.png create mode 100644 ui/resources/touch_200_percent/scrollbar_thumb_horizontal_normal_left.png create mode 100644 ui/resources/touch_200_percent/scrollbar_thumb_horizontal_normal_right.png create mode 100644 ui/resources/touch_200_percent/scrollbar_thumb_horizontal_pressed_center.png create mode 100644 ui/resources/touch_200_percent/scrollbar_thumb_horizontal_pressed_left.png create mode 100644 ui/resources/touch_200_percent/scrollbar_thumb_horizontal_pressed_right.png create mode 100644 ui/resources/touch_200_percent/scrollbar_thumb_vertical_hover_bottom.png create mode 100644 ui/resources/touch_200_percent/scrollbar_thumb_vertical_hover_center.png create mode 100644 ui/resources/touch_200_percent/scrollbar_thumb_vertical_hover_top.png create mode 100644 ui/resources/touch_200_percent/scrollbar_thumb_vertical_normal_bottom.png create mode 100644 ui/resources/touch_200_percent/scrollbar_thumb_vertical_normal_center.png create mode 100644 ui/resources/touch_200_percent/scrollbar_thumb_vertical_normal_top.png create mode 100644 ui/resources/touch_200_percent/scrollbar_thumb_vertical_pressed_bottom.png create mode 100644 ui/resources/touch_200_percent/scrollbar_thumb_vertical_pressed_center.png create mode 100644 ui/resources/touch_200_percent/scrollbar_thumb_vertical_pressed_top.png 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 #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/default_100_percent/linux-checkbox-disabled-indeterminate.png b/ui/base/native_theme/resources/default_100_percent/linux-checkbox-disabled-indeterminate.png deleted file mode 100644 index 171d001..0000000 Binary files a/ui/base/native_theme/resources/default_100_percent/linux-checkbox-disabled-indeterminate.png and /dev/null differ diff --git a/ui/base/native_theme/resources/default_100_percent/linux-checkbox-disabled-off.png b/ui/base/native_theme/resources/default_100_percent/linux-checkbox-disabled-off.png deleted file mode 100644 index c916674..0000000 Binary files a/ui/base/native_theme/resources/default_100_percent/linux-checkbox-disabled-off.png and /dev/null differ diff --git a/ui/base/native_theme/resources/default_100_percent/linux-checkbox-disabled-on.png b/ui/base/native_theme/resources/default_100_percent/linux-checkbox-disabled-on.png deleted file mode 100644 index d9ff1c6..0000000 Binary files a/ui/base/native_theme/resources/default_100_percent/linux-checkbox-disabled-on.png and /dev/null differ diff --git a/ui/base/native_theme/resources/default_100_percent/linux-checkbox-indeterminate.png b/ui/base/native_theme/resources/default_100_percent/linux-checkbox-indeterminate.png deleted file mode 100644 index dcde3c1..0000000 Binary files a/ui/base/native_theme/resources/default_100_percent/linux-checkbox-indeterminate.png and /dev/null differ diff --git a/ui/base/native_theme/resources/default_100_percent/linux-checkbox-off.png b/ui/base/native_theme/resources/default_100_percent/linux-checkbox-off.png deleted file mode 100644 index 15cc949..0000000 Binary files a/ui/base/native_theme/resources/default_100_percent/linux-checkbox-off.png and /dev/null differ diff --git a/ui/base/native_theme/resources/default_100_percent/linux-checkbox-on.png b/ui/base/native_theme/resources/default_100_percent/linux-checkbox-on.png deleted file mode 100644 index 4c72e8a..0000000 Binary files a/ui/base/native_theme/resources/default_100_percent/linux-checkbox-on.png and /dev/null differ diff --git a/ui/base/native_theme/resources/default_100_percent/linux-progress-bar.png b/ui/base/native_theme/resources/default_100_percent/linux-progress-bar.png deleted file mode 100644 index 82a20f5..0000000 Binary files a/ui/base/native_theme/resources/default_100_percent/linux-progress-bar.png and /dev/null differ diff --git a/ui/base/native_theme/resources/default_100_percent/linux-progress-border-left.png b/ui/base/native_theme/resources/default_100_percent/linux-progress-border-left.png deleted file mode 100644 index 0dd0e50..0000000 Binary files a/ui/base/native_theme/resources/default_100_percent/linux-progress-border-left.png and /dev/null differ diff --git a/ui/base/native_theme/resources/default_100_percent/linux-progress-border-right.png b/ui/base/native_theme/resources/default_100_percent/linux-progress-border-right.png deleted file mode 100644 index d351b11..0000000 Binary files a/ui/base/native_theme/resources/default_100_percent/linux-progress-border-right.png and /dev/null differ diff --git a/ui/base/native_theme/resources/default_100_percent/linux-progress-value.png b/ui/base/native_theme/resources/default_100_percent/linux-progress-value.png deleted file mode 100644 index 251917b..0000000 Binary files a/ui/base/native_theme/resources/default_100_percent/linux-progress-value.png and /dev/null differ diff --git a/ui/base/native_theme/resources/default_100_percent/linux-radio-disabled-off.png b/ui/base/native_theme/resources/default_100_percent/linux-radio-disabled-off.png deleted file mode 100644 index 97aa6f9..0000000 Binary files a/ui/base/native_theme/resources/default_100_percent/linux-radio-disabled-off.png and /dev/null differ diff --git a/ui/base/native_theme/resources/default_100_percent/linux-radio-disabled-on.png b/ui/base/native_theme/resources/default_100_percent/linux-radio-disabled-on.png deleted file mode 100644 index 07aed36..0000000 Binary files a/ui/base/native_theme/resources/default_100_percent/linux-radio-disabled-on.png and /dev/null differ diff --git a/ui/base/native_theme/resources/default_100_percent/linux-radio-off.png b/ui/base/native_theme/resources/default_100_percent/linux-radio-off.png deleted file mode 100644 index 6a60a70..0000000 Binary files a/ui/base/native_theme/resources/default_100_percent/linux-radio-off.png and /dev/null differ diff --git a/ui/base/native_theme/resources/default_100_percent/linux-radio-on.png b/ui/base/native_theme/resources/default_100_percent/linux-radio-on.png deleted file mode 100644 index cb47411..0000000 Binary files a/ui/base/native_theme/resources/default_100_percent/linux-radio-on.png and /dev/null differ diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_horizontal_hot_center.png b/ui/base/native_theme/resources/default_100_percent/scrollbar_base_horizontal_hot_center.png deleted file mode 100644 index b285e48..0000000 Binary files a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_horizontal_hot_center.png and /dev/null differ diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_horizontal_hot_left.png b/ui/base/native_theme/resources/default_100_percent/scrollbar_base_horizontal_hot_left.png deleted file mode 100644 index 00a536e..0000000 Binary files a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_horizontal_hot_left.png and /dev/null differ diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_horizontal_hot_right.png b/ui/base/native_theme/resources/default_100_percent/scrollbar_base_horizontal_hot_right.png deleted file mode 100644 index f9658fc..0000000 Binary files a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_horizontal_hot_right.png and /dev/null differ diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_horizontal_normal_center.png b/ui/base/native_theme/resources/default_100_percent/scrollbar_base_horizontal_normal_center.png deleted file mode 100644 index 23dd2b8..0000000 Binary files a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_horizontal_normal_center.png and /dev/null differ diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_horizontal_normal_left.png b/ui/base/native_theme/resources/default_100_percent/scrollbar_base_horizontal_normal_left.png deleted file mode 100644 index daa1d16..0000000 Binary files a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_horizontal_normal_left.png and /dev/null differ diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_horizontal_normal_right.png b/ui/base/native_theme/resources/default_100_percent/scrollbar_base_horizontal_normal_right.png deleted file mode 100644 index f7facdd..0000000 Binary files a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_horizontal_normal_right.png and /dev/null differ diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_hot_edge.png b/ui/base/native_theme/resources/default_100_percent/scrollbar_base_hot_edge.png deleted file mode 100644 index 9970962..0000000 Binary files a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_hot_edge.png and /dev/null differ diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_normal_edge.png b/ui/base/native_theme/resources/default_100_percent/scrollbar_base_normal_edge.png deleted file mode 100644 index 84ded01..0000000 Binary files a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_normal_edge.png and /dev/null differ diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_vertical_hot_bottom.png b/ui/base/native_theme/resources/default_100_percent/scrollbar_base_vertical_hot_bottom.png deleted file mode 100644 index 5ce339d..0000000 Binary files a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_vertical_hot_bottom.png and /dev/null differ diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_vertical_hot_center.png b/ui/base/native_theme/resources/default_100_percent/scrollbar_base_vertical_hot_center.png deleted file mode 100644 index cbe8595..0000000 Binary files a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_vertical_hot_center.png and /dev/null differ diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_vertical_hot_top.png b/ui/base/native_theme/resources/default_100_percent/scrollbar_base_vertical_hot_top.png deleted file mode 100644 index 3b75a91..0000000 Binary files a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_vertical_hot_top.png and /dev/null differ diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_vertical_normal_bottom.png b/ui/base/native_theme/resources/default_100_percent/scrollbar_base_vertical_normal_bottom.png deleted file mode 100644 index 8198858..0000000 Binary files a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_vertical_normal_bottom.png and /dev/null differ diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_vertical_normal_center.png b/ui/base/native_theme/resources/default_100_percent/scrollbar_base_vertical_normal_center.png deleted file mode 100644 index d567fe1..0000000 Binary files a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_vertical_normal_center.png and /dev/null differ diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_vertical_normal_top.png b/ui/base/native_theme/resources/default_100_percent/scrollbar_base_vertical_normal_top.png deleted file mode 100644 index 3139c6e..0000000 Binary files a/ui/base/native_theme/resources/default_100_percent/scrollbar_base_vertical_normal_top.png and /dev/null differ diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_hot_center.png b/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_hot_center.png deleted file mode 100644 index adf6b3d..0000000 Binary files a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_hot_center.png and /dev/null differ diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_hot_left.png b/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_hot_left.png deleted file mode 100644 index 77b5437..0000000 Binary files a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_hot_left.png and /dev/null differ diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_hot_right.png b/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_hot_right.png deleted file mode 100644 index 1ffe6dc..0000000 Binary files a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_hot_right.png and /dev/null differ diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_normal_center.png b/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_normal_center.png deleted file mode 100644 index faa4c5a..0000000 Binary files a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_normal_center.png and /dev/null differ diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_normal_left.png b/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_normal_left.png deleted file mode 100644 index 8b9cd30..0000000 Binary files a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_normal_left.png and /dev/null differ diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_normal_right.png b/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_normal_right.png deleted file mode 100644 index 47ea6fd..0000000 Binary files a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_normal_right.png and /dev/null differ diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_pressed_center.png b/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_pressed_center.png deleted file mode 100644 index b489ee9..0000000 Binary files a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_pressed_center.png and /dev/null differ diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_pressed_left.png b/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_pressed_left.png deleted file mode 100644 index 2871028..0000000 Binary files a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_pressed_left.png and /dev/null differ diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_pressed_right.png b/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_pressed_right.png deleted file mode 100644 index 5f46678..0000000 Binary files a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_horizontal_pressed_right.png and /dev/null differ diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_hot_bottom.png b/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_hot_bottom.png deleted file mode 100644 index 645dce3..0000000 Binary files a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_hot_bottom.png and /dev/null differ diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_hot_center.png b/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_hot_center.png deleted file mode 100644 index 667f595..0000000 Binary files a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_hot_center.png and /dev/null differ diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_hot_top.png b/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_hot_top.png deleted file mode 100644 index 29cb3b2..0000000 Binary files a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_hot_top.png and /dev/null differ diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_normal_bottom.png b/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_normal_bottom.png deleted file mode 100644 index 02de50b..0000000 Binary files a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_normal_bottom.png and /dev/null differ diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_normal_center.png b/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_normal_center.png deleted file mode 100644 index 35fb2f3..0000000 Binary files a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_normal_center.png and /dev/null differ diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_normal_top.png b/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_normal_top.png deleted file mode 100644 index dbf4b76..0000000 Binary files a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_normal_top.png and /dev/null differ diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_pressed_bottom.png b/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_pressed_bottom.png deleted file mode 100644 index 961e579..0000000 Binary files a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_pressed_bottom.png and /dev/null differ diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_pressed_center.png b/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_pressed_center.png deleted file mode 100644 index 0d2c710..0000000 Binary files a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_pressed_center.png and /dev/null differ diff --git a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_pressed_top.png b/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_pressed_top.png deleted file mode 100644 index 145cd8c..0000000 Binary files a/ui/base/native_theme/resources/default_100_percent/scrollbar_thumb_vertical_pressed_top.png and /dev/null differ 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_horizontal_hover_center.png b/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_horizontal_hover_center.png deleted file mode 100644 index 266b471..0000000 Binary files a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_horizontal_hover_center.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_horizontal_hover_left.png b/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_horizontal_hover_left.png deleted file mode 100644 index a2a55a1..0000000 Binary files a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_horizontal_hover_left.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_horizontal_hover_right.png b/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_horizontal_hover_right.png deleted file mode 100644 index c3bf637..0000000 Binary files a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_horizontal_hover_right.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_horizontal_hover_right_fix.png b/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_horizontal_hover_right_fix.png deleted file mode 100644 index 3cc77f3..0000000 Binary files a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_horizontal_hover_right_fix.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_horizontal_normal_center.png b/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_horizontal_normal_center.png deleted file mode 100644 index 2f9a2c7..0000000 Binary files a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_horizontal_normal_center.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_horizontal_normal_left.png b/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_horizontal_normal_left.png deleted file mode 100644 index 36a4eda..0000000 Binary files a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_horizontal_normal_left.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_horizontal_normal_right.png b/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_horizontal_normal_right.png deleted file mode 100644 index 5fe2a1c..0000000 Binary files a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_horizontal_normal_right.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_hover_edge.png b/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_hover_edge.png deleted file mode 100644 index e6f379d..0000000 Binary files a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_hover_edge.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_normal_edge.png b/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_normal_edge.png deleted file mode 100644 index 2747ebc..0000000 Binary files a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_normal_edge.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_vertical_hover_bottom.png b/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_vertical_hover_bottom.png deleted file mode 100644 index fcf9ff8..0000000 Binary files a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_vertical_hover_bottom.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_vertical_hover_bottom_fix.png b/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_vertical_hover_bottom_fix.png deleted file mode 100644 index 3820a35..0000000 Binary files a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_vertical_hover_bottom_fix.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_vertical_hover_center.png b/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_vertical_hover_center.png deleted file mode 100644 index be18ceb..0000000 Binary files a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_vertical_hover_center.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_vertical_hover_top.png b/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_vertical_hover_top.png deleted file mode 100644 index 26431ed..0000000 Binary files a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_vertical_hover_top.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_vertical_normal_bottom.png b/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_vertical_normal_bottom.png deleted file mode 100644 index 84d62ed..0000000 Binary files a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_vertical_normal_bottom.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_vertical_normal_center.png b/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_vertical_normal_center.png deleted file mode 100644 index f827c87..0000000 Binary files a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_vertical_normal_center.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_vertical_normal_top.png b/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_vertical_normal_top.png deleted file mode 100644 index 2357970..0000000 Binary files a/ui/base/native_theme/resources/touch_100_percent/scrollbar_base_vertical_normal_top.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_hover_center.png b/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_hover_center.png deleted file mode 100644 index 853612f..0000000 Binary files a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_hover_center.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_hover_left.png b/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_hover_left.png deleted file mode 100644 index b08b41a..0000000 Binary files a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_hover_left.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_hover_right.png b/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_hover_right.png deleted file mode 100644 index 1c5247a..0000000 Binary files a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_hover_right.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_normal_center.png b/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_normal_center.png deleted file mode 100644 index e40aee6..0000000 Binary files a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_normal_center.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_normal_left.png b/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_normal_left.png deleted file mode 100644 index d40f6a3..0000000 Binary files a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_normal_left.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_normal_right.png b/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_normal_right.png deleted file mode 100644 index dc35157..0000000 Binary files a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_normal_right.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_pressed_center.png b/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_pressed_center.png deleted file mode 100644 index af1275a..0000000 Binary files a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_pressed_center.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_pressed_left.png b/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_pressed_left.png deleted file mode 100644 index aa3731f..0000000 Binary files a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_pressed_left.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_pressed_right.png b/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_pressed_right.png deleted file mode 100644 index 3ad8021..0000000 Binary files a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_horizontal_pressed_right.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_hover_bottom.png b/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_hover_bottom.png deleted file mode 100644 index 8ecd7f2..0000000 Binary files a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_hover_bottom.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_hover_center.png b/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_hover_center.png deleted file mode 100644 index d1f1dfc..0000000 Binary files a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_hover_center.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_hover_top.png b/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_hover_top.png deleted file mode 100644 index 5ec367c..0000000 Binary files a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_hover_top.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_normal_bottom.png b/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_normal_bottom.png deleted file mode 100644 index 54f2882..0000000 Binary files a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_normal_bottom.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_normal_center.png b/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_normal_center.png deleted file mode 100644 index 4ca3bb2..0000000 Binary files a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_normal_center.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_normal_top.png b/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_normal_top.png deleted file mode 100644 index 8a5e2e5..0000000 Binary files a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_normal_top.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_pressed_bottom.png b/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_pressed_bottom.png deleted file mode 100644 index 472e268..0000000 Binary files a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_pressed_bottom.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_pressed_center.png b/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_pressed_center.png deleted file mode 100644 index 0c2c8f9..0000000 Binary files a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_pressed_center.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_pressed_top.png b/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_pressed_top.png deleted file mode 100644 index 8743981..0000000 Binary files a/ui/base/native_theme/resources/touch_100_percent/scrollbar_thumb_vertical_pressed_top.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_horizontal_hover_center.png b/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_horizontal_hover_center.png deleted file mode 100644 index a810568..0000000 Binary files a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_horizontal_hover_center.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_horizontal_hover_left.png b/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_horizontal_hover_left.png deleted file mode 100644 index 7b06819..0000000 Binary files a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_horizontal_hover_left.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_horizontal_hover_right.png b/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_horizontal_hover_right.png deleted file mode 100644 index 8e2973f..0000000 Binary files a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_horizontal_hover_right.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_horizontal_hover_right_fix.png b/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_horizontal_hover_right_fix.png deleted file mode 100644 index 8c67fa6..0000000 Binary files a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_horizontal_hover_right_fix.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_horizontal_normal_center.png b/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_horizontal_normal_center.png deleted file mode 100644 index 7fa87c7..0000000 Binary files a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_horizontal_normal_center.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_horizontal_normal_left.png b/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_horizontal_normal_left.png deleted file mode 100644 index d48277f..0000000 Binary files a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_horizontal_normal_left.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_horizontal_normal_right.png b/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_horizontal_normal_right.png deleted file mode 100644 index 5870e86..0000000 Binary files a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_horizontal_normal_right.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_hover_edge.png b/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_hover_edge.png deleted file mode 100644 index 8a11695..0000000 Binary files a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_hover_edge.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_normal_edge.png b/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_normal_edge.png deleted file mode 100644 index a997c65..0000000 Binary files a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_normal_edge.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_vertical_hover_bottom.png b/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_vertical_hover_bottom.png deleted file mode 100644 index 1547ddd..0000000 Binary files a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_vertical_hover_bottom.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_vertical_hover_bottom_fix.png b/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_vertical_hover_bottom_fix.png deleted file mode 100644 index 161bc37..0000000 Binary files a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_vertical_hover_bottom_fix.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_vertical_hover_center.png b/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_vertical_hover_center.png deleted file mode 100644 index 0aaf4e9..0000000 Binary files a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_vertical_hover_center.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_vertical_hover_top.png b/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_vertical_hover_top.png deleted file mode 100644 index bd9539b..0000000 Binary files a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_vertical_hover_top.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_vertical_normal_bottom.png b/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_vertical_normal_bottom.png deleted file mode 100644 index fe6ddeb..0000000 Binary files a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_vertical_normal_bottom.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_vertical_normal_center.png b/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_vertical_normal_center.png deleted file mode 100644 index 14bfc993..0000000 Binary files a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_vertical_normal_center.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_vertical_normal_top.png b/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_vertical_normal_top.png deleted file mode 100644 index 66c7a19..0000000 Binary files a/ui/base/native_theme/resources/touch_200_percent/scrollbar_base_vertical_normal_top.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_hover_center.png b/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_hover_center.png deleted file mode 100644 index cb99e0e..0000000 Binary files a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_hover_center.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_hover_left.png b/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_hover_left.png deleted file mode 100644 index e23a8e3..0000000 Binary files a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_hover_left.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_hover_right.png b/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_hover_right.png deleted file mode 100644 index cad1559..0000000 Binary files a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_hover_right.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_normal_center.png b/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_normal_center.png deleted file mode 100644 index 7d1a140..0000000 Binary files a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_normal_center.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_normal_left.png b/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_normal_left.png deleted file mode 100644 index 5ce29a6..0000000 Binary files a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_normal_left.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_normal_right.png b/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_normal_right.png deleted file mode 100644 index 29dcd84..0000000 Binary files a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_normal_right.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_pressed_center.png b/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_pressed_center.png deleted file mode 100644 index 3d6bbe3..0000000 Binary files a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_pressed_center.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_pressed_left.png b/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_pressed_left.png deleted file mode 100644 index 8e6c835..0000000 Binary files a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_pressed_left.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_pressed_right.png b/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_pressed_right.png deleted file mode 100644 index 94a1db2..0000000 Binary files a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_horizontal_pressed_right.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_hover_bottom.png b/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_hover_bottom.png deleted file mode 100644 index cd91f17..0000000 Binary files a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_hover_bottom.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_hover_center.png b/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_hover_center.png deleted file mode 100644 index e381097..0000000 Binary files a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_hover_center.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_hover_top.png b/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_hover_top.png deleted file mode 100644 index 4d9532e..0000000 Binary files a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_hover_top.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_normal_bottom.png b/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_normal_bottom.png deleted file mode 100644 index c55365c..0000000 Binary files a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_normal_bottom.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_normal_center.png b/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_normal_center.png deleted file mode 100644 index d5a805c..0000000 Binary files a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_normal_center.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_normal_top.png b/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_normal_top.png deleted file mode 100644 index dcfe08d..0000000 Binary files a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_normal_top.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_pressed_bottom.png b/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_pressed_bottom.png deleted file mode 100644 index aa16a4f..0000000 Binary files a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_pressed_bottom.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_pressed_center.png b/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_pressed_center.png deleted file mode 100644 index 1ee4c9e..0000000 Binary files a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_pressed_center.png and /dev/null differ diff --git a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_pressed_top.png b/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_pressed_top.png deleted file mode 100644 index 90a0bba..0000000 Binary files a/ui/base/native_theme/resources/touch_200_percent/scrollbar_thumb_vertical_pressed_top.png and /dev/null differ diff --git a/ui/resources/default_100_percent/linux-checkbox-disabled-indeterminate.png b/ui/resources/default_100_percent/linux-checkbox-disabled-indeterminate.png new file mode 100644 index 0000000..171d001 Binary files /dev/null and b/ui/resources/default_100_percent/linux-checkbox-disabled-indeterminate.png differ diff --git a/ui/resources/default_100_percent/linux-checkbox-disabled-off.png b/ui/resources/default_100_percent/linux-checkbox-disabled-off.png new file mode 100644 index 0000000..c916674 Binary files /dev/null and b/ui/resources/default_100_percent/linux-checkbox-disabled-off.png differ diff --git a/ui/resources/default_100_percent/linux-checkbox-disabled-on.png b/ui/resources/default_100_percent/linux-checkbox-disabled-on.png new file mode 100644 index 0000000..d9ff1c6 Binary files /dev/null and b/ui/resources/default_100_percent/linux-checkbox-disabled-on.png differ diff --git a/ui/resources/default_100_percent/linux-checkbox-indeterminate.png b/ui/resources/default_100_percent/linux-checkbox-indeterminate.png new file mode 100644 index 0000000..dcde3c1 Binary files /dev/null and b/ui/resources/default_100_percent/linux-checkbox-indeterminate.png differ diff --git a/ui/resources/default_100_percent/linux-checkbox-off.png b/ui/resources/default_100_percent/linux-checkbox-off.png new file mode 100644 index 0000000..15cc949 Binary files /dev/null and b/ui/resources/default_100_percent/linux-checkbox-off.png differ diff --git a/ui/resources/default_100_percent/linux-checkbox-on.png b/ui/resources/default_100_percent/linux-checkbox-on.png new file mode 100644 index 0000000..4c72e8a Binary files /dev/null and b/ui/resources/default_100_percent/linux-checkbox-on.png differ diff --git a/ui/resources/default_100_percent/linux-progress-bar.png b/ui/resources/default_100_percent/linux-progress-bar.png new file mode 100644 index 0000000..82a20f5 Binary files /dev/null and b/ui/resources/default_100_percent/linux-progress-bar.png differ diff --git a/ui/resources/default_100_percent/linux-progress-border-left.png b/ui/resources/default_100_percent/linux-progress-border-left.png new file mode 100644 index 0000000..0dd0e50 Binary files /dev/null and b/ui/resources/default_100_percent/linux-progress-border-left.png differ diff --git a/ui/resources/default_100_percent/linux-progress-border-right.png b/ui/resources/default_100_percent/linux-progress-border-right.png new file mode 100644 index 0000000..d351b11 Binary files /dev/null and b/ui/resources/default_100_percent/linux-progress-border-right.png differ diff --git a/ui/resources/default_100_percent/linux-progress-value.png b/ui/resources/default_100_percent/linux-progress-value.png new file mode 100644 index 0000000..251917b Binary files /dev/null and b/ui/resources/default_100_percent/linux-progress-value.png differ diff --git a/ui/resources/default_100_percent/linux-radio-disabled-off.png b/ui/resources/default_100_percent/linux-radio-disabled-off.png new file mode 100644 index 0000000..97aa6f9 Binary files /dev/null and b/ui/resources/default_100_percent/linux-radio-disabled-off.png differ diff --git a/ui/resources/default_100_percent/linux-radio-disabled-on.png b/ui/resources/default_100_percent/linux-radio-disabled-on.png new file mode 100644 index 0000000..07aed36 Binary files /dev/null and b/ui/resources/default_100_percent/linux-radio-disabled-on.png differ diff --git a/ui/resources/default_100_percent/linux-radio-off.png b/ui/resources/default_100_percent/linux-radio-off.png new file mode 100644 index 0000000..6a60a70 Binary files /dev/null and b/ui/resources/default_100_percent/linux-radio-off.png differ diff --git a/ui/resources/default_100_percent/linux-radio-on.png b/ui/resources/default_100_percent/linux-radio-on.png new file mode 100644 index 0000000..cb47411 Binary files /dev/null and b/ui/resources/default_100_percent/linux-radio-on.png differ diff --git a/ui/resources/default_100_percent/scrollbar_base_horizontal_hover_center.png b/ui/resources/default_100_percent/scrollbar_base_horizontal_hover_center.png new file mode 100644 index 0000000..b285e48 Binary files /dev/null and b/ui/resources/default_100_percent/scrollbar_base_horizontal_hover_center.png differ diff --git a/ui/resources/default_100_percent/scrollbar_base_horizontal_hover_left.png b/ui/resources/default_100_percent/scrollbar_base_horizontal_hover_left.png new file mode 100644 index 0000000..00a536e Binary files /dev/null and b/ui/resources/default_100_percent/scrollbar_base_horizontal_hover_left.png differ diff --git a/ui/resources/default_100_percent/scrollbar_base_horizontal_hover_right.png b/ui/resources/default_100_percent/scrollbar_base_horizontal_hover_right.png new file mode 100644 index 0000000..f9658fc Binary files /dev/null and b/ui/resources/default_100_percent/scrollbar_base_horizontal_hover_right.png differ diff --git a/ui/resources/default_100_percent/scrollbar_base_horizontal_normal_center.png b/ui/resources/default_100_percent/scrollbar_base_horizontal_normal_center.png new file mode 100644 index 0000000..23dd2b8 Binary files /dev/null and b/ui/resources/default_100_percent/scrollbar_base_horizontal_normal_center.png differ diff --git a/ui/resources/default_100_percent/scrollbar_base_horizontal_normal_left.png b/ui/resources/default_100_percent/scrollbar_base_horizontal_normal_left.png new file mode 100644 index 0000000..daa1d16 Binary files /dev/null and b/ui/resources/default_100_percent/scrollbar_base_horizontal_normal_left.png differ diff --git a/ui/resources/default_100_percent/scrollbar_base_horizontal_normal_right.png b/ui/resources/default_100_percent/scrollbar_base_horizontal_normal_right.png new file mode 100644 index 0000000..f7facdd Binary files /dev/null and b/ui/resources/default_100_percent/scrollbar_base_horizontal_normal_right.png differ diff --git a/ui/resources/default_100_percent/scrollbar_base_hover_edge.png b/ui/resources/default_100_percent/scrollbar_base_hover_edge.png new file mode 100644 index 0000000..9970962 Binary files /dev/null and b/ui/resources/default_100_percent/scrollbar_base_hover_edge.png differ diff --git a/ui/resources/default_100_percent/scrollbar_base_normal_edge.png b/ui/resources/default_100_percent/scrollbar_base_normal_edge.png new file mode 100644 index 0000000..84ded01 Binary files /dev/null and b/ui/resources/default_100_percent/scrollbar_base_normal_edge.png differ diff --git a/ui/resources/default_100_percent/scrollbar_base_vertical_hover_bottom.png b/ui/resources/default_100_percent/scrollbar_base_vertical_hover_bottom.png new file mode 100644 index 0000000..5ce339d Binary files /dev/null and b/ui/resources/default_100_percent/scrollbar_base_vertical_hover_bottom.png differ diff --git a/ui/resources/default_100_percent/scrollbar_base_vertical_hover_center.png b/ui/resources/default_100_percent/scrollbar_base_vertical_hover_center.png new file mode 100644 index 0000000..cbe8595 Binary files /dev/null and b/ui/resources/default_100_percent/scrollbar_base_vertical_hover_center.png differ diff --git a/ui/resources/default_100_percent/scrollbar_base_vertical_hover_top.png b/ui/resources/default_100_percent/scrollbar_base_vertical_hover_top.png new file mode 100644 index 0000000..3b75a91 Binary files /dev/null and b/ui/resources/default_100_percent/scrollbar_base_vertical_hover_top.png differ diff --git a/ui/resources/default_100_percent/scrollbar_base_vertical_normal_bottom.png b/ui/resources/default_100_percent/scrollbar_base_vertical_normal_bottom.png new file mode 100644 index 0000000..8198858 Binary files /dev/null and b/ui/resources/default_100_percent/scrollbar_base_vertical_normal_bottom.png differ diff --git a/ui/resources/default_100_percent/scrollbar_base_vertical_normal_center.png b/ui/resources/default_100_percent/scrollbar_base_vertical_normal_center.png new file mode 100644 index 0000000..d567fe1 Binary files /dev/null and b/ui/resources/default_100_percent/scrollbar_base_vertical_normal_center.png differ diff --git a/ui/resources/default_100_percent/scrollbar_base_vertical_normal_top.png b/ui/resources/default_100_percent/scrollbar_base_vertical_normal_top.png new file mode 100644 index 0000000..3139c6e Binary files /dev/null and b/ui/resources/default_100_percent/scrollbar_base_vertical_normal_top.png differ diff --git a/ui/resources/default_100_percent/scrollbar_thumb_horizontal_hover_center.png b/ui/resources/default_100_percent/scrollbar_thumb_horizontal_hover_center.png new file mode 100644 index 0000000..adf6b3d Binary files /dev/null and b/ui/resources/default_100_percent/scrollbar_thumb_horizontal_hover_center.png differ diff --git a/ui/resources/default_100_percent/scrollbar_thumb_horizontal_hover_left.png b/ui/resources/default_100_percent/scrollbar_thumb_horizontal_hover_left.png new file mode 100644 index 0000000..77b5437 Binary files /dev/null and b/ui/resources/default_100_percent/scrollbar_thumb_horizontal_hover_left.png differ diff --git a/ui/resources/default_100_percent/scrollbar_thumb_horizontal_hover_right.png b/ui/resources/default_100_percent/scrollbar_thumb_horizontal_hover_right.png new file mode 100644 index 0000000..1ffe6dc Binary files /dev/null and b/ui/resources/default_100_percent/scrollbar_thumb_horizontal_hover_right.png differ diff --git a/ui/resources/default_100_percent/scrollbar_thumb_horizontal_normal_center.png b/ui/resources/default_100_percent/scrollbar_thumb_horizontal_normal_center.png new file mode 100644 index 0000000..faa4c5a Binary files /dev/null and b/ui/resources/default_100_percent/scrollbar_thumb_horizontal_normal_center.png differ diff --git a/ui/resources/default_100_percent/scrollbar_thumb_horizontal_normal_left.png b/ui/resources/default_100_percent/scrollbar_thumb_horizontal_normal_left.png new file mode 100644 index 0000000..8b9cd30 Binary files /dev/null and b/ui/resources/default_100_percent/scrollbar_thumb_horizontal_normal_left.png differ diff --git a/ui/resources/default_100_percent/scrollbar_thumb_horizontal_normal_right.png b/ui/resources/default_100_percent/scrollbar_thumb_horizontal_normal_right.png new file mode 100644 index 0000000..47ea6fd Binary files /dev/null and b/ui/resources/default_100_percent/scrollbar_thumb_horizontal_normal_right.png differ diff --git a/ui/resources/default_100_percent/scrollbar_thumb_horizontal_pressed_center.png b/ui/resources/default_100_percent/scrollbar_thumb_horizontal_pressed_center.png new file mode 100644 index 0000000..b489ee9 Binary files /dev/null and b/ui/resources/default_100_percent/scrollbar_thumb_horizontal_pressed_center.png differ diff --git a/ui/resources/default_100_percent/scrollbar_thumb_horizontal_pressed_left.png b/ui/resources/default_100_percent/scrollbar_thumb_horizontal_pressed_left.png new file mode 100644 index 0000000..2871028 Binary files /dev/null and b/ui/resources/default_100_percent/scrollbar_thumb_horizontal_pressed_left.png differ diff --git a/ui/resources/default_100_percent/scrollbar_thumb_horizontal_pressed_right.png b/ui/resources/default_100_percent/scrollbar_thumb_horizontal_pressed_right.png new file mode 100644 index 0000000..5f46678 Binary files /dev/null and b/ui/resources/default_100_percent/scrollbar_thumb_horizontal_pressed_right.png differ diff --git a/ui/resources/default_100_percent/scrollbar_thumb_vertical_hover_bottom.png b/ui/resources/default_100_percent/scrollbar_thumb_vertical_hover_bottom.png new file mode 100644 index 0000000..645dce3 Binary files /dev/null and b/ui/resources/default_100_percent/scrollbar_thumb_vertical_hover_bottom.png differ diff --git a/ui/resources/default_100_percent/scrollbar_thumb_vertical_hover_center.png b/ui/resources/default_100_percent/scrollbar_thumb_vertical_hover_center.png new file mode 100644 index 0000000..667f595 Binary files /dev/null and b/ui/resources/default_100_percent/scrollbar_thumb_vertical_hover_center.png differ diff --git a/ui/resources/default_100_percent/scrollbar_thumb_vertical_hover_top.png b/ui/resources/default_100_percent/scrollbar_thumb_vertical_hover_top.png new file mode 100644 index 0000000..29cb3b2 Binary files /dev/null and b/ui/resources/default_100_percent/scrollbar_thumb_vertical_hover_top.png differ diff --git a/ui/resources/default_100_percent/scrollbar_thumb_vertical_normal_bottom.png b/ui/resources/default_100_percent/scrollbar_thumb_vertical_normal_bottom.png new file mode 100644 index 0000000..02de50b Binary files /dev/null and b/ui/resources/default_100_percent/scrollbar_thumb_vertical_normal_bottom.png differ diff --git a/ui/resources/default_100_percent/scrollbar_thumb_vertical_normal_center.png b/ui/resources/default_100_percent/scrollbar_thumb_vertical_normal_center.png new file mode 100644 index 0000000..35fb2f3 Binary files /dev/null and b/ui/resources/default_100_percent/scrollbar_thumb_vertical_normal_center.png differ diff --git a/ui/resources/default_100_percent/scrollbar_thumb_vertical_normal_top.png b/ui/resources/default_100_percent/scrollbar_thumb_vertical_normal_top.png new file mode 100644 index 0000000..dbf4b76 Binary files /dev/null and b/ui/resources/default_100_percent/scrollbar_thumb_vertical_normal_top.png differ diff --git a/ui/resources/default_100_percent/scrollbar_thumb_vertical_pressed_bottom.png b/ui/resources/default_100_percent/scrollbar_thumb_vertical_pressed_bottom.png new file mode 100644 index 0000000..961e579 Binary files /dev/null and b/ui/resources/default_100_percent/scrollbar_thumb_vertical_pressed_bottom.png differ diff --git a/ui/resources/default_100_percent/scrollbar_thumb_vertical_pressed_center.png b/ui/resources/default_100_percent/scrollbar_thumb_vertical_pressed_center.png new file mode 100644 index 0000000..0d2c710 Binary files /dev/null and b/ui/resources/default_100_percent/scrollbar_thumb_vertical_pressed_center.png differ diff --git a/ui/resources/default_100_percent/scrollbar_thumb_vertical_pressed_top.png b/ui/resources/default_100_percent/scrollbar_thumb_vertical_pressed_top.png new file mode 100644 index 0000000..145cd8c Binary files /dev/null and b/ui/resources/default_100_percent/scrollbar_thumb_vertical_pressed_top.png differ diff --git a/ui/resources/touch_100_percent/scrollbar_base_horizontal_hover_center.png b/ui/resources/touch_100_percent/scrollbar_base_horizontal_hover_center.png new file mode 100644 index 0000000..266b471 Binary files /dev/null and b/ui/resources/touch_100_percent/scrollbar_base_horizontal_hover_center.png differ diff --git a/ui/resources/touch_100_percent/scrollbar_base_horizontal_hover_left.png b/ui/resources/touch_100_percent/scrollbar_base_horizontal_hover_left.png new file mode 100644 index 0000000..a2a55a1 Binary files /dev/null and b/ui/resources/touch_100_percent/scrollbar_base_horizontal_hover_left.png differ diff --git a/ui/resources/touch_100_percent/scrollbar_base_horizontal_hover_right.png b/ui/resources/touch_100_percent/scrollbar_base_horizontal_hover_right.png new file mode 100644 index 0000000..c3bf637 Binary files /dev/null and b/ui/resources/touch_100_percent/scrollbar_base_horizontal_hover_right.png differ diff --git a/ui/resources/touch_100_percent/scrollbar_base_horizontal_hover_right_fix.png b/ui/resources/touch_100_percent/scrollbar_base_horizontal_hover_right_fix.png new file mode 100644 index 0000000..3cc77f3 Binary files /dev/null and b/ui/resources/touch_100_percent/scrollbar_base_horizontal_hover_right_fix.png differ diff --git a/ui/resources/touch_100_percent/scrollbar_base_horizontal_normal_center.png b/ui/resources/touch_100_percent/scrollbar_base_horizontal_normal_center.png new file mode 100644 index 0000000..2f9a2c7 Binary files /dev/null and b/ui/resources/touch_100_percent/scrollbar_base_horizontal_normal_center.png differ diff --git a/ui/resources/touch_100_percent/scrollbar_base_horizontal_normal_left.png b/ui/resources/touch_100_percent/scrollbar_base_horizontal_normal_left.png new file mode 100644 index 0000000..36a4eda Binary files /dev/null and b/ui/resources/touch_100_percent/scrollbar_base_horizontal_normal_left.png differ diff --git a/ui/resources/touch_100_percent/scrollbar_base_horizontal_normal_right.png b/ui/resources/touch_100_percent/scrollbar_base_horizontal_normal_right.png new file mode 100644 index 0000000..5fe2a1c Binary files /dev/null and b/ui/resources/touch_100_percent/scrollbar_base_horizontal_normal_right.png differ diff --git a/ui/resources/touch_100_percent/scrollbar_base_hover_edge.png b/ui/resources/touch_100_percent/scrollbar_base_hover_edge.png new file mode 100644 index 0000000..e6f379d Binary files /dev/null and b/ui/resources/touch_100_percent/scrollbar_base_hover_edge.png differ diff --git a/ui/resources/touch_100_percent/scrollbar_base_normal_edge.png b/ui/resources/touch_100_percent/scrollbar_base_normal_edge.png new file mode 100644 index 0000000..2747ebc Binary files /dev/null and b/ui/resources/touch_100_percent/scrollbar_base_normal_edge.png differ diff --git a/ui/resources/touch_100_percent/scrollbar_base_vertical_hover_bottom.png b/ui/resources/touch_100_percent/scrollbar_base_vertical_hover_bottom.png new file mode 100644 index 0000000..fcf9ff8 Binary files /dev/null and b/ui/resources/touch_100_percent/scrollbar_base_vertical_hover_bottom.png differ diff --git a/ui/resources/touch_100_percent/scrollbar_base_vertical_hover_bottom_fix.png b/ui/resources/touch_100_percent/scrollbar_base_vertical_hover_bottom_fix.png new file mode 100644 index 0000000..3820a35 Binary files /dev/null and b/ui/resources/touch_100_percent/scrollbar_base_vertical_hover_bottom_fix.png differ diff --git a/ui/resources/touch_100_percent/scrollbar_base_vertical_hover_center.png b/ui/resources/touch_100_percent/scrollbar_base_vertical_hover_center.png new file mode 100644 index 0000000..be18ceb Binary files /dev/null and b/ui/resources/touch_100_percent/scrollbar_base_vertical_hover_center.png differ diff --git a/ui/resources/touch_100_percent/scrollbar_base_vertical_hover_top.png b/ui/resources/touch_100_percent/scrollbar_base_vertical_hover_top.png new file mode 100644 index 0000000..26431ed Binary files /dev/null and b/ui/resources/touch_100_percent/scrollbar_base_vertical_hover_top.png differ diff --git a/ui/resources/touch_100_percent/scrollbar_base_vertical_normal_bottom.png b/ui/resources/touch_100_percent/scrollbar_base_vertical_normal_bottom.png new file mode 100644 index 0000000..84d62ed Binary files /dev/null and b/ui/resources/touch_100_percent/scrollbar_base_vertical_normal_bottom.png differ diff --git a/ui/resources/touch_100_percent/scrollbar_base_vertical_normal_center.png b/ui/resources/touch_100_percent/scrollbar_base_vertical_normal_center.png new file mode 100644 index 0000000..f827c87 Binary files /dev/null and b/ui/resources/touch_100_percent/scrollbar_base_vertical_normal_center.png differ diff --git a/ui/resources/touch_100_percent/scrollbar_base_vertical_normal_top.png b/ui/resources/touch_100_percent/scrollbar_base_vertical_normal_top.png new file mode 100644 index 0000000..2357970 Binary files /dev/null and b/ui/resources/touch_100_percent/scrollbar_base_vertical_normal_top.png differ diff --git a/ui/resources/touch_100_percent/scrollbar_thumb_horizontal_hover_center.png b/ui/resources/touch_100_percent/scrollbar_thumb_horizontal_hover_center.png new file mode 100644 index 0000000..853612f Binary files /dev/null and b/ui/resources/touch_100_percent/scrollbar_thumb_horizontal_hover_center.png differ diff --git a/ui/resources/touch_100_percent/scrollbar_thumb_horizontal_hover_left.png b/ui/resources/touch_100_percent/scrollbar_thumb_horizontal_hover_left.png new file mode 100644 index 0000000..b08b41a Binary files /dev/null and b/ui/resources/touch_100_percent/scrollbar_thumb_horizontal_hover_left.png differ diff --git a/ui/resources/touch_100_percent/scrollbar_thumb_horizontal_hover_right.png b/ui/resources/touch_100_percent/scrollbar_thumb_horizontal_hover_right.png new file mode 100644 index 0000000..1c5247a Binary files /dev/null and b/ui/resources/touch_100_percent/scrollbar_thumb_horizontal_hover_right.png differ diff --git a/ui/resources/touch_100_percent/scrollbar_thumb_horizontal_normal_center.png b/ui/resources/touch_100_percent/scrollbar_thumb_horizontal_normal_center.png new file mode 100644 index 0000000..e40aee6 Binary files /dev/null and b/ui/resources/touch_100_percent/scrollbar_thumb_horizontal_normal_center.png differ diff --git a/ui/resources/touch_100_percent/scrollbar_thumb_horizontal_normal_left.png b/ui/resources/touch_100_percent/scrollbar_thumb_horizontal_normal_left.png new file mode 100644 index 0000000..d40f6a3 Binary files /dev/null and b/ui/resources/touch_100_percent/scrollbar_thumb_horizontal_normal_left.png differ diff --git a/ui/resources/touch_100_percent/scrollbar_thumb_horizontal_normal_right.png b/ui/resources/touch_100_percent/scrollbar_thumb_horizontal_normal_right.png new file mode 100644 index 0000000..dc35157 Binary files /dev/null and b/ui/resources/touch_100_percent/scrollbar_thumb_horizontal_normal_right.png differ diff --git a/ui/resources/touch_100_percent/scrollbar_thumb_horizontal_pressed_center.png b/ui/resources/touch_100_percent/scrollbar_thumb_horizontal_pressed_center.png new file mode 100644 index 0000000..af1275a Binary files /dev/null and b/ui/resources/touch_100_percent/scrollbar_thumb_horizontal_pressed_center.png differ diff --git a/ui/resources/touch_100_percent/scrollbar_thumb_horizontal_pressed_left.png b/ui/resources/touch_100_percent/scrollbar_thumb_horizontal_pressed_left.png new file mode 100644 index 0000000..aa3731f Binary files /dev/null and b/ui/resources/touch_100_percent/scrollbar_thumb_horizontal_pressed_left.png differ diff --git a/ui/resources/touch_100_percent/scrollbar_thumb_horizontal_pressed_right.png b/ui/resources/touch_100_percent/scrollbar_thumb_horizontal_pressed_right.png new file mode 100644 index 0000000..3ad8021 Binary files /dev/null and b/ui/resources/touch_100_percent/scrollbar_thumb_horizontal_pressed_right.png differ diff --git a/ui/resources/touch_100_percent/scrollbar_thumb_vertical_hover_bottom.png b/ui/resources/touch_100_percent/scrollbar_thumb_vertical_hover_bottom.png new file mode 100644 index 0000000..8ecd7f2 Binary files /dev/null and b/ui/resources/touch_100_percent/scrollbar_thumb_vertical_hover_bottom.png differ diff --git a/ui/resources/touch_100_percent/scrollbar_thumb_vertical_hover_center.png b/ui/resources/touch_100_percent/scrollbar_thumb_vertical_hover_center.png new file mode 100644 index 0000000..d1f1dfc Binary files /dev/null and b/ui/resources/touch_100_percent/scrollbar_thumb_vertical_hover_center.png differ diff --git a/ui/resources/touch_100_percent/scrollbar_thumb_vertical_hover_top.png b/ui/resources/touch_100_percent/scrollbar_thumb_vertical_hover_top.png new file mode 100644 index 0000000..5ec367c Binary files /dev/null and b/ui/resources/touch_100_percent/scrollbar_thumb_vertical_hover_top.png differ diff --git a/ui/resources/touch_100_percent/scrollbar_thumb_vertical_normal_bottom.png b/ui/resources/touch_100_percent/scrollbar_thumb_vertical_normal_bottom.png new file mode 100644 index 0000000..54f2882 Binary files /dev/null and b/ui/resources/touch_100_percent/scrollbar_thumb_vertical_normal_bottom.png differ diff --git a/ui/resources/touch_100_percent/scrollbar_thumb_vertical_normal_center.png b/ui/resources/touch_100_percent/scrollbar_thumb_vertical_normal_center.png new file mode 100644 index 0000000..4ca3bb2 Binary files /dev/null and b/ui/resources/touch_100_percent/scrollbar_thumb_vertical_normal_center.png differ diff --git a/ui/resources/touch_100_percent/scrollbar_thumb_vertical_normal_top.png b/ui/resources/touch_100_percent/scrollbar_thumb_vertical_normal_top.png new file mode 100644 index 0000000..8a5e2e5 Binary files /dev/null and b/ui/resources/touch_100_percent/scrollbar_thumb_vertical_normal_top.png differ diff --git a/ui/resources/touch_100_percent/scrollbar_thumb_vertical_pressed_bottom.png b/ui/resources/touch_100_percent/scrollbar_thumb_vertical_pressed_bottom.png new file mode 100644 index 0000000..472e268 Binary files /dev/null and b/ui/resources/touch_100_percent/scrollbar_thumb_vertical_pressed_bottom.png differ diff --git a/ui/resources/touch_100_percent/scrollbar_thumb_vertical_pressed_center.png b/ui/resources/touch_100_percent/scrollbar_thumb_vertical_pressed_center.png new file mode 100644 index 0000000..0c2c8f9 Binary files /dev/null and b/ui/resources/touch_100_percent/scrollbar_thumb_vertical_pressed_center.png differ diff --git a/ui/resources/touch_100_percent/scrollbar_thumb_vertical_pressed_top.png b/ui/resources/touch_100_percent/scrollbar_thumb_vertical_pressed_top.png new file mode 100644 index 0000000..8743981 Binary files /dev/null and b/ui/resources/touch_100_percent/scrollbar_thumb_vertical_pressed_top.png differ diff --git a/ui/resources/touch_200_percent/scrollbar_base_horizontal_hover_center.png b/ui/resources/touch_200_percent/scrollbar_base_horizontal_hover_center.png new file mode 100644 index 0000000..a810568 Binary files /dev/null and b/ui/resources/touch_200_percent/scrollbar_base_horizontal_hover_center.png differ diff --git a/ui/resources/touch_200_percent/scrollbar_base_horizontal_hover_left.png b/ui/resources/touch_200_percent/scrollbar_base_horizontal_hover_left.png new file mode 100644 index 0000000..7b06819 Binary files /dev/null and b/ui/resources/touch_200_percent/scrollbar_base_horizontal_hover_left.png differ diff --git a/ui/resources/touch_200_percent/scrollbar_base_horizontal_hover_right.png b/ui/resources/touch_200_percent/scrollbar_base_horizontal_hover_right.png new file mode 100644 index 0000000..8e2973f Binary files /dev/null and b/ui/resources/touch_200_percent/scrollbar_base_horizontal_hover_right.png differ diff --git a/ui/resources/touch_200_percent/scrollbar_base_horizontal_hover_right_fix.png b/ui/resources/touch_200_percent/scrollbar_base_horizontal_hover_right_fix.png new file mode 100644 index 0000000..8c67fa6 Binary files /dev/null and b/ui/resources/touch_200_percent/scrollbar_base_horizontal_hover_right_fix.png differ diff --git a/ui/resources/touch_200_percent/scrollbar_base_horizontal_normal_center.png b/ui/resources/touch_200_percent/scrollbar_base_horizontal_normal_center.png new file mode 100644 index 0000000..7fa87c7 Binary files /dev/null and b/ui/resources/touch_200_percent/scrollbar_base_horizontal_normal_center.png differ diff --git a/ui/resources/touch_200_percent/scrollbar_base_horizontal_normal_left.png b/ui/resources/touch_200_percent/scrollbar_base_horizontal_normal_left.png new file mode 100644 index 0000000..d48277f Binary files /dev/null and b/ui/resources/touch_200_percent/scrollbar_base_horizontal_normal_left.png differ diff --git a/ui/resources/touch_200_percent/scrollbar_base_horizontal_normal_right.png b/ui/resources/touch_200_percent/scrollbar_base_horizontal_normal_right.png new file mode 100644 index 0000000..5870e86 Binary files /dev/null and b/ui/resources/touch_200_percent/scrollbar_base_horizontal_normal_right.png differ diff --git a/ui/resources/touch_200_percent/scrollbar_base_hover_edge.png b/ui/resources/touch_200_percent/scrollbar_base_hover_edge.png new file mode 100644 index 0000000..8a11695 Binary files /dev/null and b/ui/resources/touch_200_percent/scrollbar_base_hover_edge.png differ diff --git a/ui/resources/touch_200_percent/scrollbar_base_normal_edge.png b/ui/resources/touch_200_percent/scrollbar_base_normal_edge.png new file mode 100644 index 0000000..a997c65 Binary files /dev/null and b/ui/resources/touch_200_percent/scrollbar_base_normal_edge.png differ diff --git a/ui/resources/touch_200_percent/scrollbar_base_vertical_hover_bottom.png b/ui/resources/touch_200_percent/scrollbar_base_vertical_hover_bottom.png new file mode 100644 index 0000000..1547ddd Binary files /dev/null and b/ui/resources/touch_200_percent/scrollbar_base_vertical_hover_bottom.png differ diff --git a/ui/resources/touch_200_percent/scrollbar_base_vertical_hover_bottom_fix.png b/ui/resources/touch_200_percent/scrollbar_base_vertical_hover_bottom_fix.png new file mode 100644 index 0000000..161bc37 Binary files /dev/null and b/ui/resources/touch_200_percent/scrollbar_base_vertical_hover_bottom_fix.png differ diff --git a/ui/resources/touch_200_percent/scrollbar_base_vertical_hover_center.png b/ui/resources/touch_200_percent/scrollbar_base_vertical_hover_center.png new file mode 100644 index 0000000..0aaf4e9 Binary files /dev/null and b/ui/resources/touch_200_percent/scrollbar_base_vertical_hover_center.png differ diff --git a/ui/resources/touch_200_percent/scrollbar_base_vertical_hover_top.png b/ui/resources/touch_200_percent/scrollbar_base_vertical_hover_top.png new file mode 100644 index 0000000..bd9539b Binary files /dev/null and b/ui/resources/touch_200_percent/scrollbar_base_vertical_hover_top.png differ diff --git a/ui/resources/touch_200_percent/scrollbar_base_vertical_normal_bottom.png b/ui/resources/touch_200_percent/scrollbar_base_vertical_normal_bottom.png new file mode 100644 index 0000000..fe6ddeb Binary files /dev/null and b/ui/resources/touch_200_percent/scrollbar_base_vertical_normal_bottom.png differ diff --git a/ui/resources/touch_200_percent/scrollbar_base_vertical_normal_center.png b/ui/resources/touch_200_percent/scrollbar_base_vertical_normal_center.png new file mode 100644 index 0000000..14bfc993 Binary files /dev/null and b/ui/resources/touch_200_percent/scrollbar_base_vertical_normal_center.png differ diff --git a/ui/resources/touch_200_percent/scrollbar_base_vertical_normal_top.png b/ui/resources/touch_200_percent/scrollbar_base_vertical_normal_top.png new file mode 100644 index 0000000..66c7a19 Binary files /dev/null and b/ui/resources/touch_200_percent/scrollbar_base_vertical_normal_top.png differ diff --git a/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_hover_center.png b/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_hover_center.png new file mode 100644 index 0000000..cb99e0e Binary files /dev/null and b/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_hover_center.png differ diff --git a/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_hover_left.png b/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_hover_left.png new file mode 100644 index 0000000..e23a8e3 Binary files /dev/null and b/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_hover_left.png differ diff --git a/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_hover_right.png b/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_hover_right.png new file mode 100644 index 0000000..cad1559 Binary files /dev/null and b/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_hover_right.png differ diff --git a/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_normal_center.png b/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_normal_center.png new file mode 100644 index 0000000..7d1a140 Binary files /dev/null and b/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_normal_center.png differ diff --git a/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_normal_left.png b/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_normal_left.png new file mode 100644 index 0000000..5ce29a6 Binary files /dev/null and b/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_normal_left.png differ diff --git a/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_normal_right.png b/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_normal_right.png new file mode 100644 index 0000000..29dcd84 Binary files /dev/null and b/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_normal_right.png differ diff --git a/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_pressed_center.png b/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_pressed_center.png new file mode 100644 index 0000000..3d6bbe3 Binary files /dev/null and b/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_pressed_center.png differ diff --git a/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_pressed_left.png b/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_pressed_left.png new file mode 100644 index 0000000..8e6c835 Binary files /dev/null and b/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_pressed_left.png differ diff --git a/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_pressed_right.png b/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_pressed_right.png new file mode 100644 index 0000000..94a1db2 Binary files /dev/null and b/ui/resources/touch_200_percent/scrollbar_thumb_horizontal_pressed_right.png differ diff --git a/ui/resources/touch_200_percent/scrollbar_thumb_vertical_hover_bottom.png b/ui/resources/touch_200_percent/scrollbar_thumb_vertical_hover_bottom.png new file mode 100644 index 0000000..cd91f17 Binary files /dev/null and b/ui/resources/touch_200_percent/scrollbar_thumb_vertical_hover_bottom.png differ diff --git a/ui/resources/touch_200_percent/scrollbar_thumb_vertical_hover_center.png b/ui/resources/touch_200_percent/scrollbar_thumb_vertical_hover_center.png new file mode 100644 index 0000000..e381097 Binary files /dev/null and b/ui/resources/touch_200_percent/scrollbar_thumb_vertical_hover_center.png differ diff --git a/ui/resources/touch_200_percent/scrollbar_thumb_vertical_hover_top.png b/ui/resources/touch_200_percent/scrollbar_thumb_vertical_hover_top.png new file mode 100644 index 0000000..4d9532e Binary files /dev/null and b/ui/resources/touch_200_percent/scrollbar_thumb_vertical_hover_top.png differ diff --git a/ui/resources/touch_200_percent/scrollbar_thumb_vertical_normal_bottom.png b/ui/resources/touch_200_percent/scrollbar_thumb_vertical_normal_bottom.png new file mode 100644 index 0000000..c55365c Binary files /dev/null and b/ui/resources/touch_200_percent/scrollbar_thumb_vertical_normal_bottom.png differ diff --git a/ui/resources/touch_200_percent/scrollbar_thumb_vertical_normal_center.png b/ui/resources/touch_200_percent/scrollbar_thumb_vertical_normal_center.png new file mode 100644 index 0000000..d5a805c Binary files /dev/null and b/ui/resources/touch_200_percent/scrollbar_thumb_vertical_normal_center.png differ diff --git a/ui/resources/touch_200_percent/scrollbar_thumb_vertical_normal_top.png b/ui/resources/touch_200_percent/scrollbar_thumb_vertical_normal_top.png new file mode 100644 index 0000000..dcfe08d Binary files /dev/null and b/ui/resources/touch_200_percent/scrollbar_thumb_vertical_normal_top.png differ diff --git a/ui/resources/touch_200_percent/scrollbar_thumb_vertical_pressed_bottom.png b/ui/resources/touch_200_percent/scrollbar_thumb_vertical_pressed_bottom.png new file mode 100644 index 0000000..aa16a4f Binary files /dev/null and b/ui/resources/touch_200_percent/scrollbar_thumb_vertical_pressed_bottom.png differ diff --git a/ui/resources/touch_200_percent/scrollbar_thumb_vertical_pressed_center.png b/ui/resources/touch_200_percent/scrollbar_thumb_vertical_pressed_center.png new file mode 100644 index 0000000..1ee4c9e Binary files /dev/null and b/ui/resources/touch_200_percent/scrollbar_thumb_vertical_pressed_center.png differ diff --git a/ui/resources/touch_200_percent/scrollbar_thumb_vertical_pressed_top.png b/ui/resources/touch_200_percent/scrollbar_thumb_vertical_pressed_top.png new file mode 100644 index 0000000..90a0bba Binary files /dev/null and b/ui/resources/touch_200_percent/scrollbar_thumb_vertical_pressed_top.png differ 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 @@ + + @@ -91,6 +94,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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', -- cgit v1.1