diff options
135 files changed, 138 insertions, 129 deletions
diff --git a/ash/ash.gyp b/ash/ash.gyp index f21f886..21073164 100644 --- a/ash/ash.gyp +++ b/ash/ash.gyp @@ -328,7 +328,7 @@ '../ui/aura/aura.gyp:test_support_aura', '../ui/compositor/compositor.gyp:compositor', '../ui/compositor/compositor.gyp:compositor_test_support', - '../ui/ui.gyp:gfx_resources', + '../ui/ui.gyp:native_theme_resources', '../ui/ui.gyp:ui', '../ui/ui.gyp:ui_resources', '../ui/ui.gyp:ui_resources_standard', @@ -400,7 +400,7 @@ 'wm/workspace/workspace_manager_unittest.cc', 'wm/workspace/workspace_window_resizer_unittest.cc', - '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_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', ], @@ -450,7 +450,7 @@ '../ui/aura/aura.gyp:aura', '../ui/compositor/compositor.gyp:compositor', '../ui/compositor/compositor.gyp:compositor_test_support', - '../ui/ui.gyp:gfx_resources', + '../ui/ui.gyp:native_theme_resources', '../ui/ui.gyp:ui', '../ui/ui.gyp:ui_resources', '../ui/ui.gyp:ui_resources_standard', @@ -487,7 +487,7 @@ 'shell/window_type_launcher.h', 'shell/window_watcher.cc', 'shell/window_watcher.h', - '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', + '<(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 ccd025c..e124362 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -102,7 +102,7 @@ '<(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/gfx/gfx_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 342a60e..1f0f70a 100644 --- a/chrome/chrome_repack_chrome.gypi +++ b/chrome/chrome_repack_chrome.gypi @@ -18,7 +18,7 @@ 'conditions': [ ['OS != "mac" or use_aura==1', { 'pak_inputs': [ - '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/native_theme/native_theme_resources.pak', ] }], ['enable_extensions==1', { diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp index e65ca54..c9ac561 100644 --- a/chrome/chrome_resources.gyp +++ b/chrome/chrome_resources.gyp @@ -328,7 +328,7 @@ '<(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:gfx_resources', + '<(DEPTH)/ui/ui.gyp:native_theme_resources', '<(DEPTH)/ui/ui.gyp:ui_resources', '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources', '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings', diff --git a/chrome/tools/check_grd_for_unused_strings.py b/chrome/tools/check_grd_for_unused_strings.py index ec69f87..12c78c0 100755 --- a/chrome/tools/check_grd_for_unused_strings.py +++ b/chrome/tools/check_grd_for_unused_strings.py @@ -130,7 +130,10 @@ def main(): chrome_dir = os.path.join(src_dir, 'chrome') chrome_app_dir = os.path.join(chrome_dir, 'app') chrome_app_res_dir = os.path.join(chrome_app_dir, 'resources') - ui_base_dir = os.path.join(src_dir, 'ui', 'base', 'strings') + ui_base_dir = os.path.join(src_dir, 'ui', 'base',) + ui_base_strings_dir = os.path.join(ui_base_dir, 'strings') + ui_base_native_theme_dir = + os.path.join(ui_base_dir, 'native_theme', 'resources') grd_files = [ os.path.join(ash_base_dir, 'ash_strings.grd'), os.path.join(chrome_app_dir, 'chromium_strings.grd'), @@ -146,10 +149,10 @@ def main(): os.path.join(chrome_dir, 'browser', 'resources', 'shared_resources.grd'), os.path.join(chrome_dir, 'common', 'common_resources.grd'), os.path.join(chrome_dir, 'renderer', 'renderer_resources.grd'), - os.path.join(src_dir, 'ui', 'gfx', 'gfx_resources.grd'), os.path.join(src_dir, 'ui', 'resources', 'ui_resources.grd'), - os.path.join(ui_base_dir, 'app_locale_settings.grd'), - os.path.join(ui_base_dir, 'ui_strings.grd'), + os.path.join(ui_base_native_theme_dir, 'native_theme_resources.grd'), + os.path.join(ui_base_strings_dir, 'app_locale_settings.grd'), + os.path.join(ui_base_strings_dir, 'ui_strings.grd'), ] # If no source directories were given, default them: diff --git a/content/content_shell.gypi b/content/content_shell.gypi index 965cc9d..aad91af 100644 --- a/content/content_shell.gypi +++ b/content/content_shell.gypi @@ -220,7 +220,7 @@ 'conditions': [ ['OS != "mac"', { 'pak_inputs': [ - '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/native_theme/native_theme_resources.pak', ] }], ], diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids index ec1241e..dc062b8 100644 --- a/tools/gritsettings/resource_ids +++ b/tools/gritsettings/resource_ids @@ -120,7 +120,7 @@ "structures": [18000], }, - "ui/gfx/gfx_resources.grd": { + "ui/base/native_theme/resources/native_theme_resources.grd": { "includes": [18500], }, @@ -1,6 +1,6 @@ include_rules = [ "+grit/app_locale_settings.h", - "+grit/gfx_resources.h", + "+grit/native_theme_resources.h", "+grit/ui_resources_standard.h", "+grit/ui_strings.h", "+net", diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp index 48c3833..c9716f9 100644 --- a/ui/aura/aura.gyp +++ b/ui/aura/aura.gyp @@ -16,7 +16,7 @@ '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../../skia/skia.gyp:skia', '../compositor/compositor.gyp:compositor', - '../ui.gyp:gfx_resources', + '../ui.gyp:native_theme_resources', '../ui.gyp:ui', '../ui.gyp:ui_resources', '../ui.gyp:ui_resources_2x', @@ -203,7 +203,7 @@ '../../third_party/icu/icu.gyp:icuuc', '../compositor/compositor.gyp:compositor', '../compositor/compositor.gyp:compositor_test_support', - '../ui.gyp:gfx_resources', + '../ui.gyp:native_theme_resources', '../ui.gyp:ui', '../ui.gyp:ui_resources', 'aura', @@ -213,7 +213,7 @@ ], 'sources': [ 'demo/demo_main.cc', - '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/ui/base/native_theme/native_theme_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', ], }, @@ -228,7 +228,7 @@ '../compositor/compositor.gyp:compositor_test_support', '../compositor/compositor.gyp:compositor', '../gl/gl.gyp:gl', - '../ui.gyp:gfx_resources', + '../ui.gyp:native_theme_resources', '../ui.gyp:ui', '../ui.gyp:ui_resources', 'test_support_aura', @@ -247,7 +247,7 @@ 'event_filter_unittest.cc', 'event_unittest.cc', 'window_unittest.cc', - '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/ui/native_theme/native_theme_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', ], 'conditions': [ diff --git a/ui/base/native_theme/native_theme_android.cc b/ui/base/native_theme/native_theme_android.cc index 56e0dea..a7c1097 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/gfx_resources.h" +#include "grit/native_theme_resources.h" #include "third_party/skia/include/effects/SkGradientShader.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/color_utils.h" diff --git a/ui/base/native_theme/native_theme_aura.cc b/ui/base/native_theme/native_theme_aura.cc index 56336c0..65a40ff 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/gfx_resources.h" +#include "grit/native_theme_resources.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" diff --git a/ui/base/native_theme/native_theme_base.cc b/ui/base/native_theme/native_theme_base.cc index 4f86670..8cdd263 100644 --- a/ui/base/native_theme/native_theme_base.cc +++ b/ui/base/native_theme/native_theme_base.cc @@ -7,7 +7,7 @@ #include <limits> #include "base/logging.h" -#include "grit/gfx_resources.h" +#include "grit/native_theme_resources.h" #include "third_party/skia/include/effects/SkGradientShader.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/color_utils.h" diff --git a/ui/base/native_theme/resources/native_theme_resources.grd b/ui/base/native_theme/resources/native_theme_resources.grd new file mode 100644 index 0000000..f54ef1c --- /dev/null +++ b/ui/base/native_theme/resources/native_theme_resources.grd @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="UTF-8"?> +<grit latest_public_release="0" current_release="1"> + <outputs> + <output filename="grit/native_theme_resources.h" type="rc_header"> + <emit emit_type='prepend'></emit> + </output> + <output filename="grit/native_theme_resources_map.cc" type="resource_map_source" /> + <output filename="grit/native_theme_resources_map.h" type="resource_map_header" /> + <!-- TODO(oshima): Remove gfx_resources.pak once DumpRenderTree.gyp + is updated. --> + <output filename="gfx_resources.pak" type="data_package" /> + <output filename="native_theme_resources.pak" type="data_package" /> + <output filename="native_theme_resources.rc" type="rc_all" /> + </outputs> + <release seq="1"> + <includes> + <if expr="is_posix and not is_macosx and not pp_ifdef('use_aura')"> + <include name="IDR_CHECKBOX_DISABLED_INDETERMINATE" file="linux-checkbox-disabled-indeterminate.png" type="BINDATA" /> + <include name="IDR_CHECKBOX_DISABLED_OFF" file="linux-checkbox-disabled-off.png" type="BINDATA" /> + <include name="IDR_CHECKBOX_DISABLED_ON" file="linux-checkbox-disabled-on.png" type="BINDATA" /> + <include name="IDR_CHECKBOX_INDETERMINATE" file="linux-checkbox-indeterminate.png" type="BINDATA" /> + <include name="IDR_CHECKBOX_OFF" file="linux-checkbox-off.png" type="BINDATA" /> + <include name="IDR_CHECKBOX_ON" file="linux-checkbox-on.png" type="BINDATA" /> + <include name="IDR_RADIO_DISABLED_OFF" file="linux-radio-disabled-off.png" type="BINDATA" /> + <include name="IDR_RADIO_DISABLED_ON" file="linux-radio-disabled-on.png" type="BINDATA" /> + <include name="IDR_RADIO_OFF" file="linux-radio-off.png" type="BINDATA" /> + <include name="IDR_RADIO_ON" file="linux-radio-on.png" type="BINDATA" /> + <include name="IDR_PROGRESS_BAR" file="linux-progress-bar.png" type="BINDATA" /> + <include name="IDR_PROGRESS_BORDER_LEFT" file="linux-progress-border-left.png" type="BINDATA" /> + <include name="IDR_PROGRESS_BORDER_RIGHT" file="linux-progress-border-right.png" type="BINDATA" /> + <include name="IDR_PROGRESS_VALUE" file="linux-progress-value.png" type="BINDATA" /> + </if> + + <!-- TODO(jamescook): Replace Linux images with Aura-specific ones. --> + <if expr="pp_ifdef('use_aura')"> + <include name="IDR_CHECKBOX_DISABLED_INDETERMINATE" file="linux-checkbox-disabled-indeterminate.png" type="BINDATA" /> + <include name="IDR_CHECKBOX_DISABLED_OFF" file="linux-checkbox-disabled-off.png" type="BINDATA" /> + <include name="IDR_CHECKBOX_DISABLED_ON" file="linux-checkbox-disabled-on.png" type="BINDATA" /> + <include name="IDR_CHECKBOX_INDETERMINATE" file="linux-checkbox-indeterminate.png" type="BINDATA" /> + <include name="IDR_CHECKBOX_OFF" file="linux-checkbox-off.png" type="BINDATA" /> + <include name="IDR_CHECKBOX_ON" file="linux-checkbox-on.png" type="BINDATA" /> + <include name="IDR_RADIO_DISABLED_OFF" file="linux-radio-disabled-off.png" type="BINDATA" /> + <include name="IDR_RADIO_DISABLED_ON" file="linux-radio-disabled-on.png" type="BINDATA" /> + <include name="IDR_RADIO_OFF" file="linux-radio-off.png" type="BINDATA" /> + <include name="IDR_RADIO_ON" file="linux-radio-on.png" type="BINDATA" /> + <include name="IDR_PROGRESS_BAR" file="linux-progress-bar.png" type="BINDATA" /> + <include name="IDR_PROGRESS_BORDER_LEFT" file="linux-progress-border-left.png" type="BINDATA" /> + <include name="IDR_PROGRESS_BORDER_RIGHT" file="linux-progress-border-right.png" type="BINDATA" /> + <include name="IDR_PROGRESS_VALUE" file="linux-progress-value.png" type="BINDATA" /> + + <include name="IDR_SCROLL_BASE_CORNER" file="scrollbar_base_normal_edge.png" type="BINDATA" /> + <include name="IDR_SCROLL_BASE_CORNER_H" file="scrollbar_base_hot_edge.png" type="BINDATA" /> + <include name="IDR_SCROLL_BASE_HORIZONTAL_CENTER" file="scrollbar_base_horizontal_normal_center.png" type="BINDATA" /> + <include name="IDR_SCROLL_BASE_HORIZONTAL_CENTER_H" file="scrollbar_base_horizontal_hot_center.png" type="BINDATA" /> + <include name="IDR_SCROLL_BASE_HORIZONTAL_LEFT" file="scrollbar_base_horizontal_normal_left.png" type="BINDATA" /> + <include name="IDR_SCROLL_BASE_HORIZONTAL_LEFT_H" file="scrollbar_base_horizontal_hot_left.png" type="BINDATA" /> + <include name="IDR_SCROLL_BASE_HORIZONTAL_RIGHT" file="scrollbar_base_horizontal_normal_right.png" type="BINDATA" /> + <include name="IDR_SCROLL_BASE_HORIZONTAL_RIGHT_H" file="scrollbar_base_horizontal_hot_right.png" type="BINDATA" /> + <include name="IDR_SCROLL_BASE_VERTICAL_BOTTOM" file="scrollbar_base_vertical_normal_bottom.png" type="BINDATA" /> + <include name="IDR_SCROLL_BASE_VERTICAL_BOTTOM_H" file="scrollbar_base_vertical_hot_bottom.png" type="BINDATA" /> + <include name="IDR_SCROLL_BASE_VERTICAL_CENTER" file="scrollbar_base_vertical_normal_center.png" type="BINDATA" /> + <include name="IDR_SCROLL_BASE_VERTICAL_CENTER_H" file="scrollbar_base_vertical_hot_center.png" type="BINDATA" /> + <include name="IDR_SCROLL_BASE_VERTICAL_TOP" file="scrollbar_base_vertical_normal_top.png" type="BINDATA" /> + <include name="IDR_SCROLL_BASE_VERTICAL_TOP_H" file="scrollbar_base_vertical_hot_top.png" type="BINDATA" /> + <include name="IDR_SCROLL_THUMB_HORIZONTAL_CENTER" file="scrollbar_thumb_horizontal_normal_center.png" type="BINDATA" /> + <include name="IDR_SCROLL_THUMB_HORIZONTAL_CENTER_H" file="scrollbar_thumb_horizontal_hot_center.png" type="BINDATA" /> + <include name="IDR_SCROLL_THUMB_HORIZONTAL_CENTER_P" file="scrollbar_thumb_horizontal_pressed_center.png" type="BINDATA" /> + <include name="IDR_SCROLL_THUMB_HORIZONTAL_LEFT" file="scrollbar_thumb_horizontal_normal_left.png" type="BINDATA" /> + <include name="IDR_SCROLL_THUMB_HORIZONTAL_LEFT_H" file="scrollbar_thumb_horizontal_hot_left.png" type="BINDATA" /> + <include name="IDR_SCROLL_THUMB_HORIZONTAL_LEFT_P" file="scrollbar_thumb_horizontal_pressed_left.png" type="BINDATA" /> + <include name="IDR_SCROLL_THUMB_HORIZONTAL_RIGHT" file="scrollbar_thumb_horizontal_normal_right.png" type="BINDATA" /> + <include name="IDR_SCROLL_THUMB_HORIZONTAL_RIGHT_H" file="scrollbar_thumb_horizontal_hot_right.png" type="BINDATA" /> + <include name="IDR_SCROLL_THUMB_HORIZONTAL_RIGHT_P" file="scrollbar_thumb_horizontal_pressed_right.png" type="BINDATA" /> + <include name="IDR_SCROLL_THUMB_VERTICAL_BOTTOM" file="scrollbar_thumb_vertical_normal_bottom.png" type="BINDATA" /> + <include name="IDR_SCROLL_THUMB_VERTICAL_BOTTOM_H" file="scrollbar_thumb_vertical_hot_bottom.png" type="BINDATA" /> + <include name="IDR_SCROLL_THUMB_VERTICAL_BOTTOM_P" file="scrollbar_thumb_vertical_pressed_bottom.png" type="BINDATA" /> + <include name="IDR_SCROLL_THUMB_VERTICAL_CENTER" file="scrollbar_thumb_vertical_normal_center.png" type="BINDATA" /> + <include name="IDR_SCROLL_THUMB_VERTICAL_CENTER_H" file="scrollbar_thumb_vertical_hot_center.png" type="BINDATA" /> + <include name="IDR_SCROLL_THUMB_VERTICAL_CENTER_P" file="scrollbar_thumb_vertical_pressed_center.png" type="BINDATA" /> + <include name="IDR_SCROLL_THUMB_VERTICAL_TOP" file="scrollbar_thumb_vertical_normal_top.png" type="BINDATA" /> + <include name="IDR_SCROLL_THUMB_VERTICAL_TOP_H" file="scrollbar_thumb_vertical_hot_top.png" type="BINDATA" /> + <include name="IDR_SCROLL_THUMB_VERTICAL_TOP_P" file="scrollbar_thumb_vertical_pressed_top.png" type="BINDATA" /> + </if> + </includes> + </release> +</grit> + diff --git a/ui/compositor/compositor.gyp b/ui/compositor/compositor.gyp index 99eebe9..09eabf5 100644 --- a/ui/compositor/compositor.gyp +++ b/ui/compositor/compositor.gyp @@ -61,7 +61,7 @@ # TODO(sky): before we make this real need to remove # IDR_BITMAP_BRUSH_IMAGE. 'dependencies': [ - '<(DEPTH)/ui/ui.gyp:gfx_resources', + '<(DEPTH)/ui/ui.gyp:native_theme_resources', '<(DEPTH)/third_party/angle/src/build_angle.gyp:libEGL', '<(DEPTH)/third_party/angle/src/build_angle.gyp:libGLESv2', ], @@ -123,7 +123,7 @@ 'test/test_suite.h', 'test/test_utils.cc', 'test/test_utils.h', - '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/ui/native_theme/native_theme_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc' ], 'conditions': [ diff --git a/ui/gfx/DEPS b/ui/gfx/DEPS index 5dbfdb5..c2b6185 100644 --- a/ui/gfx/DEPS +++ b/ui/gfx/DEPS @@ -1,6 +1,5 @@ include_rules = [ "+base", - "+grit/gfx_resources.h", "+skia", "+third_party/angle", ] diff --git a/ui/gfx/gfx_resources.grd b/ui/gfx/gfx_resources.grd deleted file mode 100644 index f8cb030..0000000 --- a/ui/gfx/gfx_resources.grd +++ /dev/null @@ -1,90 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<grit latest_public_release="0" current_release="1"> - <outputs> - <output filename="grit/gfx_resources.h" type="rc_header"> - <emit emit_type='prepend'></emit> - </output> - <output filename="grit/gfx_resources_map.cc" type="resource_map_source" /> - <output filename="grit/gfx_resources_map.h" type="resource_map_header" /> - <output filename="gfx_resources.pak" type="data_package" /> - <output filename="gfx_resources.rc" type="rc_all" /> - </outputs> - <release seq="1"> - <includes> - <if expr="is_win"> - <!-- IDR_BITMAP_BRUSH_IMAGE is for canvas_direct2d_unittest on win --> - <!-- TODO(sky): we don't want a test only image in the release builds --> - <include name="IDR_BITMAP_BRUSH_IMAGE" file="resources\bitmap_brush_image.png" type="BINDATA" /> - </if> - - <if expr="is_posix and not is_macosx and not pp_ifdef('use_aura')"> - <include name="IDR_CHECKBOX_DISABLED_INDETERMINATE" file="resources\linux-checkbox-disabled-indeterminate.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_DISABLED_OFF" file="resources\linux-checkbox-disabled-off.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_DISABLED_ON" file="resources\linux-checkbox-disabled-on.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_INDETERMINATE" file="resources\linux-checkbox-indeterminate.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_OFF" file="resources\linux-checkbox-off.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_ON" file="resources\linux-checkbox-on.png" type="BINDATA" /> - <include name="IDR_RADIO_DISABLED_OFF" file="resources\linux-radio-disabled-off.png" type="BINDATA" /> - <include name="IDR_RADIO_DISABLED_ON" file="resources\linux-radio-disabled-on.png" type="BINDATA" /> - <include name="IDR_RADIO_OFF" file="resources\linux-radio-off.png" type="BINDATA" /> - <include name="IDR_RADIO_ON" file="resources\linux-radio-on.png" type="BINDATA" /> - <include name="IDR_PROGRESS_BAR" file="resources\linux-progress-bar.png" type="BINDATA" /> - <include name="IDR_PROGRESS_BORDER_LEFT" file="resources\linux-progress-border-left.png" type="BINDATA" /> - <include name="IDR_PROGRESS_BORDER_RIGHT" file="resources\linux-progress-border-right.png" type="BINDATA" /> - <include name="IDR_PROGRESS_VALUE" file="resources\linux-progress-value.png" type="BINDATA" /> - </if> - - <!-- TODO(jamescook): Replace Linux images with Aura-specific ones. --> - <if expr="pp_ifdef('use_aura')"> - <include name="IDR_CHECKBOX_DISABLED_INDETERMINATE" file="resources\linux-checkbox-disabled-indeterminate.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_DISABLED_OFF" file="resources\linux-checkbox-disabled-off.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_DISABLED_ON" file="resources\linux-checkbox-disabled-on.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_INDETERMINATE" file="resources\linux-checkbox-indeterminate.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_OFF" file="resources\linux-checkbox-off.png" type="BINDATA" /> - <include name="IDR_CHECKBOX_ON" file="resources\linux-checkbox-on.png" type="BINDATA" /> - <include name="IDR_RADIO_DISABLED_OFF" file="resources\linux-radio-disabled-off.png" type="BINDATA" /> - <include name="IDR_RADIO_DISABLED_ON" file="resources\linux-radio-disabled-on.png" type="BINDATA" /> - <include name="IDR_RADIO_OFF" file="resources\linux-radio-off.png" type="BINDATA" /> - <include name="IDR_RADIO_ON" file="resources\linux-radio-on.png" type="BINDATA" /> - <include name="IDR_PROGRESS_BAR" file="resources\linux-progress-bar.png" type="BINDATA" /> - <include name="IDR_PROGRESS_BORDER_LEFT" file="resources\linux-progress-border-left.png" type="BINDATA" /> - <include name="IDR_PROGRESS_BORDER_RIGHT" file="resources\linux-progress-border-right.png" type="BINDATA" /> - <include name="IDR_PROGRESS_VALUE" file="resources\linux-progress-value.png" type="BINDATA" /> - - <include name="IDR_SCROLL_BASE_CORNER" file="resources\scrollbar_base_normal_edge.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_CORNER_H" file="resources\scrollbar_base_hot_edge.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_HORIZONTAL_CENTER" file="resources\scrollbar_base_horizontal_normal_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_HORIZONTAL_CENTER_H" file="resources\scrollbar_base_horizontal_hot_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_HORIZONTAL_LEFT" file="resources\scrollbar_base_horizontal_normal_left.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_HORIZONTAL_LEFT_H" file="resources\scrollbar_base_horizontal_hot_left.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_HORIZONTAL_RIGHT" file="resources\scrollbar_base_horizontal_normal_right.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_HORIZONTAL_RIGHT_H" file="resources\scrollbar_base_horizontal_hot_right.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_VERTICAL_BOTTOM" file="resources\scrollbar_base_vertical_normal_bottom.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_VERTICAL_BOTTOM_H" file="resources\scrollbar_base_vertical_hot_bottom.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_VERTICAL_CENTER" file="resources\scrollbar_base_vertical_normal_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_VERTICAL_CENTER_H" file="resources\scrollbar_base_vertical_hot_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_VERTICAL_TOP" file="resources\scrollbar_base_vertical_normal_top.png" type="BINDATA" /> - <include name="IDR_SCROLL_BASE_VERTICAL_TOP_H" file="resources\scrollbar_base_vertical_hot_top.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_HORIZONTAL_CENTER" file="resources\scrollbar_thumb_horizontal_normal_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_HORIZONTAL_CENTER_H" file="resources\scrollbar_thumb_horizontal_hot_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_HORIZONTAL_CENTER_P" file="resources\scrollbar_thumb_horizontal_pressed_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_HORIZONTAL_LEFT" file="resources\scrollbar_thumb_horizontal_normal_left.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_HORIZONTAL_LEFT_H" file="resources\scrollbar_thumb_horizontal_hot_left.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_HORIZONTAL_LEFT_P" file="resources\scrollbar_thumb_horizontal_pressed_left.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_HORIZONTAL_RIGHT" file="resources\scrollbar_thumb_horizontal_normal_right.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_HORIZONTAL_RIGHT_H" file="resources\scrollbar_thumb_horizontal_hot_right.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_HORIZONTAL_RIGHT_P" file="resources\scrollbar_thumb_horizontal_pressed_right.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_VERTICAL_BOTTOM" file="resources\scrollbar_thumb_vertical_normal_bottom.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_VERTICAL_BOTTOM_H" file="resources\scrollbar_thumb_vertical_hot_bottom.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_VERTICAL_BOTTOM_P" file="resources\scrollbar_thumb_vertical_pressed_bottom.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_VERTICAL_CENTER" file="resources\scrollbar_thumb_vertical_normal_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_VERTICAL_CENTER_H" file="resources\scrollbar_thumb_vertical_hot_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_VERTICAL_CENTER_P" file="resources\scrollbar_thumb_vertical_pressed_center.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_VERTICAL_TOP" file="resources\scrollbar_thumb_vertical_normal_top.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_VERTICAL_TOP_H" file="resources\scrollbar_thumb_vertical_hot_top.png" type="BINDATA" /> - <include name="IDR_SCROLL_THUMB_VERTICAL_TOP_P" file="resources\scrollbar_thumb_vertical_pressed_top.png" type="BINDATA" /> - </if> - </includes> - </release> -</grit> - diff --git a/ui/gfx/resources/bitmap_brush_image.png b/ui/gfx/resources/bitmap_brush_image.png Binary files differdeleted file mode 100644 index be8d7e7..0000000 --- a/ui/gfx/resources/bitmap_brush_image.png +++ /dev/null diff --git a/ui/gfx/resources/linux-checkbox-disabled-indeterminate.png b/ui/gfx/resources/linux-checkbox-disabled-indeterminate.png Binary files differdeleted file mode 100644 index 171d001..0000000 --- a/ui/gfx/resources/linux-checkbox-disabled-indeterminate.png +++ /dev/null diff --git a/ui/gfx/resources/linux-checkbox-disabled-off.png b/ui/gfx/resources/linux-checkbox-disabled-off.png Binary files differdeleted file mode 100644 index c916674..0000000 --- a/ui/gfx/resources/linux-checkbox-disabled-off.png +++ /dev/null diff --git a/ui/gfx/resources/linux-checkbox-disabled-on.png b/ui/gfx/resources/linux-checkbox-disabled-on.png Binary files differdeleted file mode 100644 index d9ff1c6..0000000 --- a/ui/gfx/resources/linux-checkbox-disabled-on.png +++ /dev/null diff --git a/ui/gfx/resources/linux-checkbox-indeterminate.png b/ui/gfx/resources/linux-checkbox-indeterminate.png Binary files differdeleted file mode 100644 index dcde3c1..0000000 --- a/ui/gfx/resources/linux-checkbox-indeterminate.png +++ /dev/null diff --git a/ui/gfx/resources/linux-checkbox-off.png b/ui/gfx/resources/linux-checkbox-off.png Binary files differdeleted file mode 100644 index 15cc949..0000000 --- a/ui/gfx/resources/linux-checkbox-off.png +++ /dev/null diff --git a/ui/gfx/resources/linux-checkbox-on.png b/ui/gfx/resources/linux-checkbox-on.png Binary files differdeleted file mode 100644 index 4c72e8a..0000000 --- a/ui/gfx/resources/linux-checkbox-on.png +++ /dev/null diff --git a/ui/gfx/resources/linux-progress-bar.png b/ui/gfx/resources/linux-progress-bar.png Binary files differdeleted file mode 100644 index 82a20f5..0000000 --- a/ui/gfx/resources/linux-progress-bar.png +++ /dev/null diff --git a/ui/gfx/resources/linux-progress-border-left.png b/ui/gfx/resources/linux-progress-border-left.png Binary files differdeleted file mode 100644 index 0dd0e50..0000000 --- a/ui/gfx/resources/linux-progress-border-left.png +++ /dev/null diff --git a/ui/gfx/resources/linux-progress-border-right.png b/ui/gfx/resources/linux-progress-border-right.png Binary files differdeleted file mode 100644 index d351b11..0000000 --- a/ui/gfx/resources/linux-progress-border-right.png +++ /dev/null diff --git a/ui/gfx/resources/linux-progress-value.png b/ui/gfx/resources/linux-progress-value.png Binary files differdeleted file mode 100644 index 251917b..0000000 --- a/ui/gfx/resources/linux-progress-value.png +++ /dev/null diff --git a/ui/gfx/resources/linux-radio-disabled-off.png b/ui/gfx/resources/linux-radio-disabled-off.png Binary files differdeleted file mode 100644 index 97aa6f9..0000000 --- a/ui/gfx/resources/linux-radio-disabled-off.png +++ /dev/null diff --git a/ui/gfx/resources/linux-radio-disabled-on.png b/ui/gfx/resources/linux-radio-disabled-on.png Binary files differdeleted file mode 100644 index 07aed36..0000000 --- a/ui/gfx/resources/linux-radio-disabled-on.png +++ /dev/null diff --git a/ui/gfx/resources/linux-radio-off.png b/ui/gfx/resources/linux-radio-off.png Binary files differdeleted file mode 100644 index 6a60a70..0000000 --- a/ui/gfx/resources/linux-radio-off.png +++ /dev/null diff --git a/ui/gfx/resources/linux-radio-on.png b/ui/gfx/resources/linux-radio-on.png Binary files differdeleted file mode 100644 index cb47411..0000000 --- a/ui/gfx/resources/linux-radio-on.png +++ /dev/null diff --git a/ui/gfx/resources/scrollbar_base_horizontal_hot_center.png b/ui/gfx/resources/scrollbar_base_horizontal_hot_center.png Binary files differdeleted file mode 100644 index b285e48..0000000 --- a/ui/gfx/resources/scrollbar_base_horizontal_hot_center.png +++ /dev/null diff --git a/ui/gfx/resources/scrollbar_base_horizontal_hot_left.png b/ui/gfx/resources/scrollbar_base_horizontal_hot_left.png Binary files differdeleted file mode 100644 index 00a536e..0000000 --- a/ui/gfx/resources/scrollbar_base_horizontal_hot_left.png +++ /dev/null diff --git a/ui/gfx/resources/scrollbar_base_horizontal_hot_right.png b/ui/gfx/resources/scrollbar_base_horizontal_hot_right.png Binary files differdeleted file mode 100644 index f9658fc..0000000 --- a/ui/gfx/resources/scrollbar_base_horizontal_hot_right.png +++ /dev/null diff --git a/ui/gfx/resources/scrollbar_base_horizontal_normal_center.png b/ui/gfx/resources/scrollbar_base_horizontal_normal_center.png Binary files differdeleted file mode 100644 index 23dd2b8..0000000 --- a/ui/gfx/resources/scrollbar_base_horizontal_normal_center.png +++ /dev/null diff --git a/ui/gfx/resources/scrollbar_base_horizontal_normal_left.png b/ui/gfx/resources/scrollbar_base_horizontal_normal_left.png Binary files differdeleted file mode 100644 index daa1d16..0000000 --- a/ui/gfx/resources/scrollbar_base_horizontal_normal_left.png +++ /dev/null diff --git a/ui/gfx/resources/scrollbar_base_horizontal_normal_right.png b/ui/gfx/resources/scrollbar_base_horizontal_normal_right.png Binary files differdeleted file mode 100644 index f7facdd..0000000 --- a/ui/gfx/resources/scrollbar_base_horizontal_normal_right.png +++ /dev/null diff --git a/ui/gfx/resources/scrollbar_base_hot_edge.png b/ui/gfx/resources/scrollbar_base_hot_edge.png Binary files differdeleted file mode 100644 index 9970962..0000000 --- a/ui/gfx/resources/scrollbar_base_hot_edge.png +++ /dev/null diff --git a/ui/gfx/resources/scrollbar_base_normal_edge.png b/ui/gfx/resources/scrollbar_base_normal_edge.png Binary files differdeleted file mode 100644 index 84ded01..0000000 --- a/ui/gfx/resources/scrollbar_base_normal_edge.png +++ /dev/null diff --git a/ui/gfx/resources/scrollbar_base_vertical_hot_bottom.png b/ui/gfx/resources/scrollbar_base_vertical_hot_bottom.png Binary files differdeleted file mode 100644 index 5ce339d..0000000 --- a/ui/gfx/resources/scrollbar_base_vertical_hot_bottom.png +++ /dev/null diff --git a/ui/gfx/resources/scrollbar_base_vertical_hot_center.png b/ui/gfx/resources/scrollbar_base_vertical_hot_center.png Binary files differdeleted file mode 100644 index cbe8595..0000000 --- a/ui/gfx/resources/scrollbar_base_vertical_hot_center.png +++ /dev/null diff --git a/ui/gfx/resources/scrollbar_base_vertical_hot_top.png b/ui/gfx/resources/scrollbar_base_vertical_hot_top.png Binary files differdeleted file mode 100644 index 3b75a91..0000000 --- a/ui/gfx/resources/scrollbar_base_vertical_hot_top.png +++ /dev/null diff --git a/ui/gfx/resources/scrollbar_base_vertical_normal_bottom.png b/ui/gfx/resources/scrollbar_base_vertical_normal_bottom.png Binary files differdeleted file mode 100644 index 8198858..0000000 --- a/ui/gfx/resources/scrollbar_base_vertical_normal_bottom.png +++ /dev/null diff --git a/ui/gfx/resources/scrollbar_base_vertical_normal_center.png b/ui/gfx/resources/scrollbar_base_vertical_normal_center.png Binary files differdeleted file mode 100644 index d567fe1..0000000 --- a/ui/gfx/resources/scrollbar_base_vertical_normal_center.png +++ /dev/null diff --git a/ui/gfx/resources/scrollbar_base_vertical_normal_top.png b/ui/gfx/resources/scrollbar_base_vertical_normal_top.png Binary files differdeleted file mode 100644 index 3139c6e..0000000 --- a/ui/gfx/resources/scrollbar_base_vertical_normal_top.png +++ /dev/null diff --git a/ui/gfx/resources/scrollbar_thumb_horizontal_hot_center.png b/ui/gfx/resources/scrollbar_thumb_horizontal_hot_center.png Binary files differdeleted file mode 100644 index adf6b3d..0000000 --- a/ui/gfx/resources/scrollbar_thumb_horizontal_hot_center.png +++ /dev/null diff --git a/ui/gfx/resources/scrollbar_thumb_horizontal_hot_left.png b/ui/gfx/resources/scrollbar_thumb_horizontal_hot_left.png Binary files differdeleted file mode 100644 index 77b5437..0000000 --- a/ui/gfx/resources/scrollbar_thumb_horizontal_hot_left.png +++ /dev/null diff --git a/ui/gfx/resources/scrollbar_thumb_horizontal_hot_right.png b/ui/gfx/resources/scrollbar_thumb_horizontal_hot_right.png Binary files differdeleted file mode 100644 index 1ffe6dc..0000000 --- a/ui/gfx/resources/scrollbar_thumb_horizontal_hot_right.png +++ /dev/null diff --git a/ui/gfx/resources/scrollbar_thumb_horizontal_normal_center.png b/ui/gfx/resources/scrollbar_thumb_horizontal_normal_center.png Binary files differdeleted file mode 100644 index faa4c5a..0000000 --- a/ui/gfx/resources/scrollbar_thumb_horizontal_normal_center.png +++ /dev/null diff --git a/ui/gfx/resources/scrollbar_thumb_horizontal_normal_left.png b/ui/gfx/resources/scrollbar_thumb_horizontal_normal_left.png Binary files differdeleted file mode 100644 index 8b9cd30..0000000 --- a/ui/gfx/resources/scrollbar_thumb_horizontal_normal_left.png +++ /dev/null diff --git a/ui/gfx/resources/scrollbar_thumb_horizontal_normal_right.png b/ui/gfx/resources/scrollbar_thumb_horizontal_normal_right.png Binary files differdeleted file mode 100644 index 47ea6fd..0000000 --- a/ui/gfx/resources/scrollbar_thumb_horizontal_normal_right.png +++ /dev/null diff --git a/ui/gfx/resources/scrollbar_thumb_horizontal_pressed_center.png b/ui/gfx/resources/scrollbar_thumb_horizontal_pressed_center.png Binary files differdeleted file mode 100644 index b489ee9..0000000 --- a/ui/gfx/resources/scrollbar_thumb_horizontal_pressed_center.png +++ /dev/null diff --git a/ui/gfx/resources/scrollbar_thumb_horizontal_pressed_left.png b/ui/gfx/resources/scrollbar_thumb_horizontal_pressed_left.png Binary files differdeleted file mode 100644 index 2871028..0000000 --- a/ui/gfx/resources/scrollbar_thumb_horizontal_pressed_left.png +++ /dev/null diff --git a/ui/gfx/resources/scrollbar_thumb_horizontal_pressed_right.png b/ui/gfx/resources/scrollbar_thumb_horizontal_pressed_right.png Binary files differdeleted file mode 100644 index 5f46678..0000000 --- a/ui/gfx/resources/scrollbar_thumb_horizontal_pressed_right.png +++ /dev/null diff --git a/ui/gfx/resources/scrollbar_thumb_vertical_hot_bottom.png b/ui/gfx/resources/scrollbar_thumb_vertical_hot_bottom.png Binary files differdeleted file mode 100644 index 645dce3..0000000 --- a/ui/gfx/resources/scrollbar_thumb_vertical_hot_bottom.png +++ /dev/null diff --git a/ui/gfx/resources/scrollbar_thumb_vertical_hot_center.png b/ui/gfx/resources/scrollbar_thumb_vertical_hot_center.png Binary files differdeleted file mode 100644 index 667f595..0000000 --- a/ui/gfx/resources/scrollbar_thumb_vertical_hot_center.png +++ /dev/null diff --git a/ui/gfx/resources/scrollbar_thumb_vertical_hot_top.png b/ui/gfx/resources/scrollbar_thumb_vertical_hot_top.png Binary files differdeleted file mode 100644 index 29cb3b2..0000000 --- a/ui/gfx/resources/scrollbar_thumb_vertical_hot_top.png +++ /dev/null diff --git a/ui/gfx/resources/scrollbar_thumb_vertical_normal_bottom.png b/ui/gfx/resources/scrollbar_thumb_vertical_normal_bottom.png Binary files differdeleted file mode 100644 index 02de50b..0000000 --- a/ui/gfx/resources/scrollbar_thumb_vertical_normal_bottom.png +++ /dev/null diff --git a/ui/gfx/resources/scrollbar_thumb_vertical_normal_center.png b/ui/gfx/resources/scrollbar_thumb_vertical_normal_center.png Binary files differdeleted file mode 100644 index 35fb2f3..0000000 --- a/ui/gfx/resources/scrollbar_thumb_vertical_normal_center.png +++ /dev/null diff --git a/ui/gfx/resources/scrollbar_thumb_vertical_normal_top.png b/ui/gfx/resources/scrollbar_thumb_vertical_normal_top.png Binary files differdeleted file mode 100644 index dbf4b76..0000000 --- a/ui/gfx/resources/scrollbar_thumb_vertical_normal_top.png +++ /dev/null diff --git a/ui/gfx/resources/scrollbar_thumb_vertical_pressed_bottom.png b/ui/gfx/resources/scrollbar_thumb_vertical_pressed_bottom.png Binary files differdeleted file mode 100644 index 961e579..0000000 --- a/ui/gfx/resources/scrollbar_thumb_vertical_pressed_bottom.png +++ /dev/null diff --git a/ui/gfx/resources/scrollbar_thumb_vertical_pressed_center.png b/ui/gfx/resources/scrollbar_thumb_vertical_pressed_center.png Binary files differdeleted file mode 100644 index 0d2c710..0000000 --- a/ui/gfx/resources/scrollbar_thumb_vertical_pressed_center.png +++ /dev/null diff --git a/ui/gfx/resources/scrollbar_thumb_vertical_pressed_top.png b/ui/gfx/resources/scrollbar_thumb_vertical_pressed_top.png Binary files differdeleted file mode 100644 index 145cd8c..0000000 --- a/ui/gfx/resources/scrollbar_thumb_vertical_pressed_top.png +++ /dev/null diff --git a/ui/gfx/resources/touch_100/scrollbar_base_horizontal_hover_center.png b/ui/gfx/resources/touch_100/scrollbar_base_horizontal_hover_center.png Binary files differdeleted file mode 100644 index 266b471..0000000 --- a/ui/gfx/resources/touch_100/scrollbar_base_horizontal_hover_center.png +++ /dev/null diff --git a/ui/gfx/resources/touch_100/scrollbar_base_horizontal_hover_left.png b/ui/gfx/resources/touch_100/scrollbar_base_horizontal_hover_left.png Binary files differdeleted file mode 100644 index a2a55a1..0000000 --- a/ui/gfx/resources/touch_100/scrollbar_base_horizontal_hover_left.png +++ /dev/null diff --git a/ui/gfx/resources/touch_100/scrollbar_base_horizontal_hover_right.png b/ui/gfx/resources/touch_100/scrollbar_base_horizontal_hover_right.png Binary files differdeleted file mode 100644 index c3bf637..0000000 --- a/ui/gfx/resources/touch_100/scrollbar_base_horizontal_hover_right.png +++ /dev/null diff --git a/ui/gfx/resources/touch_100/scrollbar_base_horizontal_hover_right_fix.png b/ui/gfx/resources/touch_100/scrollbar_base_horizontal_hover_right_fix.png Binary files differdeleted file mode 100644 index 3cc77f3..0000000 --- a/ui/gfx/resources/touch_100/scrollbar_base_horizontal_hover_right_fix.png +++ /dev/null diff --git a/ui/gfx/resources/touch_100/scrollbar_base_horizontal_normal_center.png b/ui/gfx/resources/touch_100/scrollbar_base_horizontal_normal_center.png Binary files differdeleted file mode 100644 index 2f9a2c7..0000000 --- a/ui/gfx/resources/touch_100/scrollbar_base_horizontal_normal_center.png +++ /dev/null diff --git a/ui/gfx/resources/touch_100/scrollbar_base_horizontal_normal_left.png b/ui/gfx/resources/touch_100/scrollbar_base_horizontal_normal_left.png Binary files differdeleted file mode 100644 index 36a4eda..0000000 --- a/ui/gfx/resources/touch_100/scrollbar_base_horizontal_normal_left.png +++ /dev/null diff --git a/ui/gfx/resources/touch_100/scrollbar_base_horizontal_normal_right.png b/ui/gfx/resources/touch_100/scrollbar_base_horizontal_normal_right.png Binary files differdeleted file mode 100644 index 5fe2a1c..0000000 --- a/ui/gfx/resources/touch_100/scrollbar_base_horizontal_normal_right.png +++ /dev/null diff --git a/ui/gfx/resources/touch_100/scrollbar_base_hover_edge.png b/ui/gfx/resources/touch_100/scrollbar_base_hover_edge.png Binary files differdeleted file mode 100644 index e6f379d..0000000 --- a/ui/gfx/resources/touch_100/scrollbar_base_hover_edge.png +++ /dev/null diff --git a/ui/gfx/resources/touch_100/scrollbar_base_normal_edge.png b/ui/gfx/resources/touch_100/scrollbar_base_normal_edge.png Binary files differdeleted file mode 100644 index 2747ebc..0000000 --- a/ui/gfx/resources/touch_100/scrollbar_base_normal_edge.png +++ /dev/null diff --git a/ui/gfx/resources/touch_100/scrollbar_base_vertical_hover_bottom.png b/ui/gfx/resources/touch_100/scrollbar_base_vertical_hover_bottom.png Binary files differdeleted file mode 100644 index fcf9ff8..0000000 --- a/ui/gfx/resources/touch_100/scrollbar_base_vertical_hover_bottom.png +++ /dev/null diff --git a/ui/gfx/resources/touch_100/scrollbar_base_vertical_hover_bottom_fix.png b/ui/gfx/resources/touch_100/scrollbar_base_vertical_hover_bottom_fix.png Binary files differdeleted file mode 100644 index 3820a35..0000000 --- a/ui/gfx/resources/touch_100/scrollbar_base_vertical_hover_bottom_fix.png +++ /dev/null diff --git a/ui/gfx/resources/touch_100/scrollbar_base_vertical_hover_center.png b/ui/gfx/resources/touch_100/scrollbar_base_vertical_hover_center.png Binary files differdeleted file mode 100644 index be18ceb..0000000 --- a/ui/gfx/resources/touch_100/scrollbar_base_vertical_hover_center.png +++ /dev/null diff --git a/ui/gfx/resources/touch_100/scrollbar_base_vertical_hover_top.png b/ui/gfx/resources/touch_100/scrollbar_base_vertical_hover_top.png Binary files differdeleted file mode 100644 index 26431ed..0000000 --- a/ui/gfx/resources/touch_100/scrollbar_base_vertical_hover_top.png +++ /dev/null diff --git a/ui/gfx/resources/touch_100/scrollbar_base_vertical_normal_bottom.png b/ui/gfx/resources/touch_100/scrollbar_base_vertical_normal_bottom.png Binary files differdeleted file mode 100644 index 84d62ed..0000000 --- a/ui/gfx/resources/touch_100/scrollbar_base_vertical_normal_bottom.png +++ /dev/null diff --git a/ui/gfx/resources/touch_100/scrollbar_base_vertical_normal_center.png b/ui/gfx/resources/touch_100/scrollbar_base_vertical_normal_center.png Binary files differdeleted file mode 100644 index f827c87..0000000 --- a/ui/gfx/resources/touch_100/scrollbar_base_vertical_normal_center.png +++ /dev/null diff --git a/ui/gfx/resources/touch_100/scrollbar_base_vertical_normal_top.png b/ui/gfx/resources/touch_100/scrollbar_base_vertical_normal_top.png Binary files differdeleted file mode 100644 index 2357970..0000000 --- a/ui/gfx/resources/touch_100/scrollbar_base_vertical_normal_top.png +++ /dev/null diff --git a/ui/gfx/resources/touch_100/scrollbar_thumb_horizontal_hover_center.png b/ui/gfx/resources/touch_100/scrollbar_thumb_horizontal_hover_center.png Binary files differdeleted file mode 100644 index 853612f..0000000 --- a/ui/gfx/resources/touch_100/scrollbar_thumb_horizontal_hover_center.png +++ /dev/null diff --git a/ui/gfx/resources/touch_100/scrollbar_thumb_horizontal_hover_left.png b/ui/gfx/resources/touch_100/scrollbar_thumb_horizontal_hover_left.png Binary files differdeleted file mode 100644 index b08b41a..0000000 --- a/ui/gfx/resources/touch_100/scrollbar_thumb_horizontal_hover_left.png +++ /dev/null diff --git a/ui/gfx/resources/touch_100/scrollbar_thumb_horizontal_hover_right.png b/ui/gfx/resources/touch_100/scrollbar_thumb_horizontal_hover_right.png Binary files differdeleted file mode 100644 index 1c5247a..0000000 --- a/ui/gfx/resources/touch_100/scrollbar_thumb_horizontal_hover_right.png +++ /dev/null diff --git a/ui/gfx/resources/touch_100/scrollbar_thumb_horizontal_normal_center.png b/ui/gfx/resources/touch_100/scrollbar_thumb_horizontal_normal_center.png Binary files differdeleted file mode 100644 index e40aee6..0000000 --- a/ui/gfx/resources/touch_100/scrollbar_thumb_horizontal_normal_center.png +++ /dev/null diff --git a/ui/gfx/resources/touch_100/scrollbar_thumb_horizontal_normal_left.png b/ui/gfx/resources/touch_100/scrollbar_thumb_horizontal_normal_left.png Binary files differdeleted file mode 100644 index d40f6a3..0000000 --- a/ui/gfx/resources/touch_100/scrollbar_thumb_horizontal_normal_left.png +++ /dev/null diff --git a/ui/gfx/resources/touch_100/scrollbar_thumb_horizontal_normal_right.png b/ui/gfx/resources/touch_100/scrollbar_thumb_horizontal_normal_right.png Binary files differdeleted file mode 100644 index dc35157..0000000 --- a/ui/gfx/resources/touch_100/scrollbar_thumb_horizontal_normal_right.png +++ /dev/null diff --git a/ui/gfx/resources/touch_100/scrollbar_thumb_horizontal_pressed_center.png b/ui/gfx/resources/touch_100/scrollbar_thumb_horizontal_pressed_center.png Binary files differdeleted file mode 100644 index af1275a..0000000 --- a/ui/gfx/resources/touch_100/scrollbar_thumb_horizontal_pressed_center.png +++ /dev/null diff --git a/ui/gfx/resources/touch_100/scrollbar_thumb_horizontal_pressed_left.png b/ui/gfx/resources/touch_100/scrollbar_thumb_horizontal_pressed_left.png Binary files differdeleted file mode 100644 index aa3731f..0000000 --- a/ui/gfx/resources/touch_100/scrollbar_thumb_horizontal_pressed_left.png +++ /dev/null diff --git a/ui/gfx/resources/touch_100/scrollbar_thumb_horizontal_pressed_right.png b/ui/gfx/resources/touch_100/scrollbar_thumb_horizontal_pressed_right.png Binary files differdeleted file mode 100644 index 3ad8021..0000000 --- a/ui/gfx/resources/touch_100/scrollbar_thumb_horizontal_pressed_right.png +++ /dev/null diff --git a/ui/gfx/resources/touch_100/scrollbar_thumb_vertical_hover_bottom.png b/ui/gfx/resources/touch_100/scrollbar_thumb_vertical_hover_bottom.png Binary files differdeleted file mode 100644 index 8ecd7f2..0000000 --- a/ui/gfx/resources/touch_100/scrollbar_thumb_vertical_hover_bottom.png +++ /dev/null diff --git a/ui/gfx/resources/touch_100/scrollbar_thumb_vertical_hover_center.png b/ui/gfx/resources/touch_100/scrollbar_thumb_vertical_hover_center.png Binary files differdeleted file mode 100644 index d1f1dfc..0000000 --- a/ui/gfx/resources/touch_100/scrollbar_thumb_vertical_hover_center.png +++ /dev/null diff --git a/ui/gfx/resources/touch_100/scrollbar_thumb_vertical_hover_top.png b/ui/gfx/resources/touch_100/scrollbar_thumb_vertical_hover_top.png Binary files differdeleted file mode 100644 index 5ec367c..0000000 --- a/ui/gfx/resources/touch_100/scrollbar_thumb_vertical_hover_top.png +++ /dev/null diff --git a/ui/gfx/resources/touch_100/scrollbar_thumb_vertical_normal_bottom.png b/ui/gfx/resources/touch_100/scrollbar_thumb_vertical_normal_bottom.png Binary files differdeleted file mode 100644 index 54f2882..0000000 --- a/ui/gfx/resources/touch_100/scrollbar_thumb_vertical_normal_bottom.png +++ /dev/null diff --git a/ui/gfx/resources/touch_100/scrollbar_thumb_vertical_normal_center.png b/ui/gfx/resources/touch_100/scrollbar_thumb_vertical_normal_center.png Binary files differdeleted file mode 100644 index 4ca3bb2..0000000 --- a/ui/gfx/resources/touch_100/scrollbar_thumb_vertical_normal_center.png +++ /dev/null diff --git a/ui/gfx/resources/touch_100/scrollbar_thumb_vertical_normal_top.png b/ui/gfx/resources/touch_100/scrollbar_thumb_vertical_normal_top.png Binary files differdeleted file mode 100644 index 8a5e2e5..0000000 --- a/ui/gfx/resources/touch_100/scrollbar_thumb_vertical_normal_top.png +++ /dev/null diff --git a/ui/gfx/resources/touch_100/scrollbar_thumb_vertical_pressed_bottom.png b/ui/gfx/resources/touch_100/scrollbar_thumb_vertical_pressed_bottom.png Binary files differdeleted file mode 100644 index 472e268..0000000 --- a/ui/gfx/resources/touch_100/scrollbar_thumb_vertical_pressed_bottom.png +++ /dev/null diff --git a/ui/gfx/resources/touch_100/scrollbar_thumb_vertical_pressed_center.png b/ui/gfx/resources/touch_100/scrollbar_thumb_vertical_pressed_center.png Binary files differdeleted file mode 100644 index 0c2c8f9..0000000 --- a/ui/gfx/resources/touch_100/scrollbar_thumb_vertical_pressed_center.png +++ /dev/null diff --git a/ui/gfx/resources/touch_100/scrollbar_thumb_vertical_pressed_top.png b/ui/gfx/resources/touch_100/scrollbar_thumb_vertical_pressed_top.png Binary files differdeleted file mode 100644 index 8743981..0000000 --- a/ui/gfx/resources/touch_100/scrollbar_thumb_vertical_pressed_top.png +++ /dev/null diff --git a/ui/gfx/resources/touch_200/scrollbar_base_horizontal_hover_center.png b/ui/gfx/resources/touch_200/scrollbar_base_horizontal_hover_center.png Binary files differdeleted file mode 100644 index a810568..0000000 --- a/ui/gfx/resources/touch_200/scrollbar_base_horizontal_hover_center.png +++ /dev/null diff --git a/ui/gfx/resources/touch_200/scrollbar_base_horizontal_hover_left.png b/ui/gfx/resources/touch_200/scrollbar_base_horizontal_hover_left.png Binary files differdeleted file mode 100644 index 7b06819..0000000 --- a/ui/gfx/resources/touch_200/scrollbar_base_horizontal_hover_left.png +++ /dev/null diff --git a/ui/gfx/resources/touch_200/scrollbar_base_horizontal_hover_right.png b/ui/gfx/resources/touch_200/scrollbar_base_horizontal_hover_right.png Binary files differdeleted file mode 100644 index 8e2973f..0000000 --- a/ui/gfx/resources/touch_200/scrollbar_base_horizontal_hover_right.png +++ /dev/null diff --git a/ui/gfx/resources/touch_200/scrollbar_base_horizontal_hover_right_fix.png b/ui/gfx/resources/touch_200/scrollbar_base_horizontal_hover_right_fix.png Binary files differdeleted file mode 100644 index 8c67fa6..0000000 --- a/ui/gfx/resources/touch_200/scrollbar_base_horizontal_hover_right_fix.png +++ /dev/null diff --git a/ui/gfx/resources/touch_200/scrollbar_base_horizontal_normal_center.png b/ui/gfx/resources/touch_200/scrollbar_base_horizontal_normal_center.png Binary files differdeleted file mode 100644 index 7fa87c7..0000000 --- a/ui/gfx/resources/touch_200/scrollbar_base_horizontal_normal_center.png +++ /dev/null diff --git a/ui/gfx/resources/touch_200/scrollbar_base_horizontal_normal_left.png b/ui/gfx/resources/touch_200/scrollbar_base_horizontal_normal_left.png Binary files differdeleted file mode 100644 index d48277f..0000000 --- a/ui/gfx/resources/touch_200/scrollbar_base_horizontal_normal_left.png +++ /dev/null diff --git a/ui/gfx/resources/touch_200/scrollbar_base_horizontal_normal_right.png b/ui/gfx/resources/touch_200/scrollbar_base_horizontal_normal_right.png Binary files differdeleted file mode 100644 index 5870e86..0000000 --- a/ui/gfx/resources/touch_200/scrollbar_base_horizontal_normal_right.png +++ /dev/null diff --git a/ui/gfx/resources/touch_200/scrollbar_base_hover_edge.png b/ui/gfx/resources/touch_200/scrollbar_base_hover_edge.png Binary files differdeleted file mode 100644 index 8a11695..0000000 --- a/ui/gfx/resources/touch_200/scrollbar_base_hover_edge.png +++ /dev/null diff --git a/ui/gfx/resources/touch_200/scrollbar_base_normal_edge.png b/ui/gfx/resources/touch_200/scrollbar_base_normal_edge.png Binary files differdeleted file mode 100644 index a997c65..0000000 --- a/ui/gfx/resources/touch_200/scrollbar_base_normal_edge.png +++ /dev/null diff --git a/ui/gfx/resources/touch_200/scrollbar_base_vertical_hover_bottom.png b/ui/gfx/resources/touch_200/scrollbar_base_vertical_hover_bottom.png Binary files differdeleted file mode 100644 index 1547ddd..0000000 --- a/ui/gfx/resources/touch_200/scrollbar_base_vertical_hover_bottom.png +++ /dev/null diff --git a/ui/gfx/resources/touch_200/scrollbar_base_vertical_hover_bottom_fix.png b/ui/gfx/resources/touch_200/scrollbar_base_vertical_hover_bottom_fix.png Binary files differdeleted file mode 100644 index 161bc37..0000000 --- a/ui/gfx/resources/touch_200/scrollbar_base_vertical_hover_bottom_fix.png +++ /dev/null diff --git a/ui/gfx/resources/touch_200/scrollbar_base_vertical_hover_center.png b/ui/gfx/resources/touch_200/scrollbar_base_vertical_hover_center.png Binary files differdeleted file mode 100644 index 0aaf4e9..0000000 --- a/ui/gfx/resources/touch_200/scrollbar_base_vertical_hover_center.png +++ /dev/null diff --git a/ui/gfx/resources/touch_200/scrollbar_base_vertical_hover_top.png b/ui/gfx/resources/touch_200/scrollbar_base_vertical_hover_top.png Binary files differdeleted file mode 100644 index bd9539b..0000000 --- a/ui/gfx/resources/touch_200/scrollbar_base_vertical_hover_top.png +++ /dev/null diff --git a/ui/gfx/resources/touch_200/scrollbar_base_vertical_normal_bottom.png b/ui/gfx/resources/touch_200/scrollbar_base_vertical_normal_bottom.png Binary files differdeleted file mode 100644 index fe6ddeb..0000000 --- a/ui/gfx/resources/touch_200/scrollbar_base_vertical_normal_bottom.png +++ /dev/null diff --git a/ui/gfx/resources/touch_200/scrollbar_base_vertical_normal_center.png b/ui/gfx/resources/touch_200/scrollbar_base_vertical_normal_center.png Binary files differdeleted file mode 100644 index 14bfc993..0000000 --- a/ui/gfx/resources/touch_200/scrollbar_base_vertical_normal_center.png +++ /dev/null diff --git a/ui/gfx/resources/touch_200/scrollbar_base_vertical_normal_top.png b/ui/gfx/resources/touch_200/scrollbar_base_vertical_normal_top.png Binary files differdeleted file mode 100644 index 66c7a19..0000000 --- a/ui/gfx/resources/touch_200/scrollbar_base_vertical_normal_top.png +++ /dev/null diff --git a/ui/gfx/resources/touch_200/scrollbar_thumb_horizontal_hover_center.png b/ui/gfx/resources/touch_200/scrollbar_thumb_horizontal_hover_center.png Binary files differdeleted file mode 100644 index cb99e0e..0000000 --- a/ui/gfx/resources/touch_200/scrollbar_thumb_horizontal_hover_center.png +++ /dev/null diff --git a/ui/gfx/resources/touch_200/scrollbar_thumb_horizontal_hover_left.png b/ui/gfx/resources/touch_200/scrollbar_thumb_horizontal_hover_left.png Binary files differdeleted file mode 100644 index e23a8e3..0000000 --- a/ui/gfx/resources/touch_200/scrollbar_thumb_horizontal_hover_left.png +++ /dev/null diff --git a/ui/gfx/resources/touch_200/scrollbar_thumb_horizontal_hover_right.png b/ui/gfx/resources/touch_200/scrollbar_thumb_horizontal_hover_right.png Binary files differdeleted file mode 100644 index cad1559..0000000 --- a/ui/gfx/resources/touch_200/scrollbar_thumb_horizontal_hover_right.png +++ /dev/null diff --git a/ui/gfx/resources/touch_200/scrollbar_thumb_horizontal_normal_center.png b/ui/gfx/resources/touch_200/scrollbar_thumb_horizontal_normal_center.png Binary files differdeleted file mode 100644 index 7d1a140..0000000 --- a/ui/gfx/resources/touch_200/scrollbar_thumb_horizontal_normal_center.png +++ /dev/null diff --git a/ui/gfx/resources/touch_200/scrollbar_thumb_horizontal_normal_left.png b/ui/gfx/resources/touch_200/scrollbar_thumb_horizontal_normal_left.png Binary files differdeleted file mode 100644 index 5ce29a6..0000000 --- a/ui/gfx/resources/touch_200/scrollbar_thumb_horizontal_normal_left.png +++ /dev/null diff --git a/ui/gfx/resources/touch_200/scrollbar_thumb_horizontal_normal_right.png b/ui/gfx/resources/touch_200/scrollbar_thumb_horizontal_normal_right.png Binary files differdeleted file mode 100644 index 29dcd84..0000000 --- a/ui/gfx/resources/touch_200/scrollbar_thumb_horizontal_normal_right.png +++ /dev/null diff --git a/ui/gfx/resources/touch_200/scrollbar_thumb_horizontal_pressed_center.png b/ui/gfx/resources/touch_200/scrollbar_thumb_horizontal_pressed_center.png Binary files differdeleted file mode 100644 index 3d6bbe3..0000000 --- a/ui/gfx/resources/touch_200/scrollbar_thumb_horizontal_pressed_center.png +++ /dev/null diff --git a/ui/gfx/resources/touch_200/scrollbar_thumb_horizontal_pressed_left.png b/ui/gfx/resources/touch_200/scrollbar_thumb_horizontal_pressed_left.png Binary files differdeleted file mode 100644 index 8e6c835..0000000 --- a/ui/gfx/resources/touch_200/scrollbar_thumb_horizontal_pressed_left.png +++ /dev/null diff --git a/ui/gfx/resources/touch_200/scrollbar_thumb_horizontal_pressed_right.png b/ui/gfx/resources/touch_200/scrollbar_thumb_horizontal_pressed_right.png Binary files differdeleted file mode 100644 index 94a1db2..0000000 --- a/ui/gfx/resources/touch_200/scrollbar_thumb_horizontal_pressed_right.png +++ /dev/null diff --git a/ui/gfx/resources/touch_200/scrollbar_thumb_vertical_hover_bottom.png b/ui/gfx/resources/touch_200/scrollbar_thumb_vertical_hover_bottom.png Binary files differdeleted file mode 100644 index cd91f17..0000000 --- a/ui/gfx/resources/touch_200/scrollbar_thumb_vertical_hover_bottom.png +++ /dev/null diff --git a/ui/gfx/resources/touch_200/scrollbar_thumb_vertical_hover_center.png b/ui/gfx/resources/touch_200/scrollbar_thumb_vertical_hover_center.png Binary files differdeleted file mode 100644 index e381097..0000000 --- a/ui/gfx/resources/touch_200/scrollbar_thumb_vertical_hover_center.png +++ /dev/null diff --git a/ui/gfx/resources/touch_200/scrollbar_thumb_vertical_hover_top.png b/ui/gfx/resources/touch_200/scrollbar_thumb_vertical_hover_top.png Binary files differdeleted file mode 100644 index 4d9532e..0000000 --- a/ui/gfx/resources/touch_200/scrollbar_thumb_vertical_hover_top.png +++ /dev/null diff --git a/ui/gfx/resources/touch_200/scrollbar_thumb_vertical_normal_bottom.png b/ui/gfx/resources/touch_200/scrollbar_thumb_vertical_normal_bottom.png Binary files differdeleted file mode 100644 index c55365c..0000000 --- a/ui/gfx/resources/touch_200/scrollbar_thumb_vertical_normal_bottom.png +++ /dev/null diff --git a/ui/gfx/resources/touch_200/scrollbar_thumb_vertical_normal_center.png b/ui/gfx/resources/touch_200/scrollbar_thumb_vertical_normal_center.png Binary files differdeleted file mode 100644 index d5a805c..0000000 --- a/ui/gfx/resources/touch_200/scrollbar_thumb_vertical_normal_center.png +++ /dev/null diff --git a/ui/gfx/resources/touch_200/scrollbar_thumb_vertical_normal_top.png b/ui/gfx/resources/touch_200/scrollbar_thumb_vertical_normal_top.png Binary files differdeleted file mode 100644 index dcfe08d..0000000 --- a/ui/gfx/resources/touch_200/scrollbar_thumb_vertical_normal_top.png +++ /dev/null diff --git a/ui/gfx/resources/touch_200/scrollbar_thumb_vertical_pressed_bottom.png b/ui/gfx/resources/touch_200/scrollbar_thumb_vertical_pressed_bottom.png Binary files differdeleted file mode 100644 index aa16a4f..0000000 --- a/ui/gfx/resources/touch_200/scrollbar_thumb_vertical_pressed_bottom.png +++ /dev/null diff --git a/ui/gfx/resources/touch_200/scrollbar_thumb_vertical_pressed_center.png b/ui/gfx/resources/touch_200/scrollbar_thumb_vertical_pressed_center.png Binary files differdeleted file mode 100644 index 1ee4c9e..0000000 --- a/ui/gfx/resources/touch_200/scrollbar_thumb_vertical_pressed_center.png +++ /dev/null diff --git a/ui/gfx/resources/touch_200/scrollbar_thumb_vertical_pressed_top.png b/ui/gfx/resources/touch_200/scrollbar_thumb_vertical_pressed_top.png Binary files differdeleted file mode 100644 index 90a0bba..0000000 --- a/ui/gfx/resources/touch_200/scrollbar_thumb_vertical_pressed_top.png +++ /dev/null @@ -30,7 +30,7 @@ '../third_party/libpng/libpng.gyp:libpng', '../third_party/zlib/zlib.gyp:zlib', 'base/strings/ui_strings.gyp:ui_strings', - 'gfx_resources', + 'native_theme_resources', '<(libjpeg_gyp_path):libjpeg', ], 'defines': [ @@ -686,20 +686,30 @@ ], }, { - 'target_name': 'gfx_resources', + 'target_name': 'native_theme_resources', 'type': 'none', 'variables': { - 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/gfx', + 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/native_theme', }, 'actions': [ { - 'action_name': 'gfx_resources', + 'action_name': 'native_theme_resources', 'variables': { - 'grit_grd_file': 'gfx/gfx_resources.grd', + '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' ], }, ], diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi index 97f4ecd..f9c9c78 100644 --- a/ui/ui_unittests.gypi +++ b/ui/ui_unittests.gypi @@ -39,7 +39,7 @@ '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', '../third_party/libpng/libpng.gyp:libpng', - 'gfx_resources', + 'native_theme_resources', 'ui', 'ui_test_support', ], @@ -98,7 +98,7 @@ 'test/run_all_unittests.cc', 'test/test_suite.cc', 'test/test_suite.h', - '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/ui/native_theme/native_theme_resources.rc', ], 'include_dirs': [ '../', diff --git a/ui/views/views.gyp b/ui/views/views.gyp index 7acb492..47c1099 100644 --- a/ui/views/views.gyp +++ b/ui/views/views.gyp @@ -497,7 +497,7 @@ '../base/strings/ui_strings.gyp:ui_strings', '../compositor/compositor.gyp:compositor', '../compositor/compositor.gyp:compositor_test_support', - '../ui.gyp:gfx_resources', + '../ui.gyp:native_theme_resources', '../ui.gyp:ui', '../ui.gyp:ui_resources', '../ui.gyp:ui_resources_standard', @@ -546,7 +546,7 @@ 'widget/widget_unittest.cc', 'run_all_unittests.cc', - '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_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', ], @@ -600,7 +600,7 @@ '../../third_party/icu/icu.gyp:icui18n', '../../third_party/icu/icu.gyp:icuuc', '../ui.gyp:ui', - '../ui.gyp:gfx_resources', + '../ui.gyp:native_theme_resources', '../ui.gyp:ui_resources', '../ui.gyp:ui_resources_standard', 'views', @@ -685,7 +685,7 @@ '../../third_party/icu/icu.gyp:icui18n', '../../third_party/icu/icu.gyp:icuuc', '../ui.gyp:ui', - '../ui.gyp:gfx_resources', + '../ui.gyp:native_theme_resources', '../ui.gyp:ui_resources', '../ui.gyp:ui_resources_standard', 'views_examples_lib', @@ -704,7 +704,7 @@ 'examples/examples_main.cc', 'test/test_views_delegate.cc', 'test/test_views_delegate.h', - '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_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', ], diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi index ae6d45d..852052b 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/gfx/gfx_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/native_theme/native_theme_resources.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:gfx_resources', + '<(DEPTH)/ui/ui.gyp:native_theme_resources', '<(DEPTH)/net/net.gyp:net_resources', '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources', '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings', |
