Move ui/gfx/resources to ui/base/native_theme/resources Step2.

ui/views/views.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
   'variables': {
     'chromium_code': 1,
   },
 
   'target_defaults': {
     'conditions': [
@@ skipping 477 matching lines @@
         '../../chrome/chrome_resources.gyp:packed_resources',
         '../../build/temp_gyp/googleurl.gyp:googleurl',
         '../../skia/skia.gyp:skia',
         '../../testing/gmock.gyp:gmock',
         '../../testing/gtest.gyp:gtest',
         '../../third_party/icu/icu.gyp:icui18n',
         '../../third_party/icu/icu.gyp:icuuc',
         '../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',
         '../ui.gyp:ui_test_support',
         'test_support_views',
         'views',
       ],
       'include_dirs': [
         '..',
       ],
@@ skipping 28 matching lines @@
         'view_unittest.cc',
         'widget/native_widget_aura_unittest.cc',
         'widget/native_widget_test_utils.h',
         'widget/native_widget_test_utils_aura.cc',
         'widget/native_widget_test_utils_win.cc',
         'widget/native_widget_unittest.cc',
         'widget/native_widget_win_unittest.cc',
         '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',

[tony, 2012/05/16 21:15:49]

As a follow up cleanup, we should see if this unittest binary can use pak files
instead of .rc files.  Otherwise the tests won't work on non-Windows.

[oshima, 2012/05/16 21:35:18]

IIRC, rc files are generated for all platforms, so this works on other
platforms.

         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc',
       ],
       'conditions': [
         ['OS=="win"', {
           'link_settings': {
             'libraries': [
               '-limm32.lib',
               '-loleacc.lib',
             ]
@@ skipping 33 matching lines @@
       'dependencies': [
         '../../base/base.gyp:base',
         '../../base/base.gyp:base_i18n',
         '../../build/temp_gyp/googleurl.gyp:googleurl',
         '../../chrome/chrome_resources.gyp:packed_resources',
         '../../content/content.gyp:content',
         '../../skia/skia.gyp:skia',
         '../../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',
       ],
       'include_dirs': [
         '..',
       ],
       'defines': [
         'VIEWS_EXAMPLES_IMPLEMENTATION',
       ],
@@ skipping 64 matching lines @@
         '../../base/base.gyp:base',
         '../../base/base.gyp:base_i18n',
         '../../chrome/chrome_resources.gyp:packed_resources',
         '../../content/content.gyp:content_shell_lib',
         '../../content/content.gyp:content',
         '../../content/content.gyp:test_support_content',
         '../../skia/skia.gyp:skia',
         '../../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',
       ],
       'include_dirs': [
         '../..',
       ],
       'sources': [
         '../../content/app/startup_helper_win.cc',
         'examples/content_client/examples_browser_main_parts.cc',
         'examples/content_client/examples_browser_main_parts.h',
         'examples/content_client/examples_content_browser_client.cc',
         'examples/content_client/examples_content_browser_client.h',
         'examples/content_client/examples_main_delegate.cc',
         'examples/content_client/examples_main_delegate.h',
         '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',

[tony, 2012/05/16 21:15:49]

Same here.

         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc',
       ],
       'conditions': [
         ['OS=="win"', {
           'link_settings': {
             'libraries': [
               '-limm32.lib',
               '-loleacc.lib',
             ]
@@ skipping 20 matching lines @@
           'sources/': [
             # This is needed because the aura rule strips it from the default
             # sources list.
             ['include', '^../../content/app/startup_helper_win.cc'],
           ],
         }],
       ],
     },  # target_name: views_examples_lib
   ],
 }