Revert 136996 - ui: Move NativeTheme files into ui/base/native_theme/ directory.

ui/ui.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,
   },
   'includes': [
     'ui_resources.gypi',
@@ skipping 194 matching lines @@
         'base/models/menu_model_delegate.h',
         'base/models/simple_menu_model.cc',
         'base/models/simple_menu_model.h',
         'base/models/table_model.cc',
         'base/models/table_model.h',
         'base/models/table_model_observer.h',
         'base/models/tree_model.cc',
         'base/models/tree_model.h',
         'base/models/tree_node_iterator.h',
         'base/models/tree_node_model.h',
-        'base/native_theme/native_theme.cc',
-        'base/native_theme/native_theme.h',
-        'base/native_theme/native_theme_android.cc',
-        'base/native_theme/native_theme_android.h',
-        'base/native_theme/native_theme_aura.cc',
-        'base/native_theme/native_theme_aura.h',
-        'base/native_theme/native_theme_base.cc',
-        'base/native_theme/native_theme_base.h',
-        'base/native_theme/native_theme_gtk.cc',
-        'base/native_theme/native_theme_gtk.h',
-        'base/native_theme/native_theme_win.cc',
-        'base/native_theme/native_theme_win.h',
         'base/range/range.cc',
         'base/range/range.h',
         'base/range/range_mac.mm',
         'base/range/range_win.cc',
         'base/resource/data_pack.cc',
         'base/resource/data_pack.h',
         'base/resource/resource_bundle.cc',
         'base/resource/resource_bundle.h',
         'base/resource/resource_bundle_android.cc',
         'base/resource/resource_bundle_aurax11.cc',
@@ skipping 100 matching lines @@
         'gfx/image/image_util.h',
         'gfx/insets.cc',
         'gfx/insets.h',
         'gfx/interpolated_transform.h',
         'gfx/interpolated_transform.cc',
         'gfx/mac/nsimage_cache.h',
         'gfx/mac/nsimage_cache.mm',
         'gfx/mac/scoped_ns_disable_screen_updates.h',
         'gfx/monitor.cc',
         'gfx/monitor.h',
+        'gfx/native_theme.cc',
+        'gfx/native_theme.h',
+        'gfx/native_theme_android.cc',
+        'gfx/native_theme_android.h',
+        'gfx/native_theme_aura.cc',
+        'gfx/native_theme_aura.h',
+        'gfx/native_theme_base.cc',
+        'gfx/native_theme_base.h',
+        'gfx/native_theme_gtk.cc',
+        'gfx/native_theme_gtk.h',
+        'gfx/native_theme_win.cc',
+        'gfx/native_theme_win.h',
         'gfx/native_widget_types.h',
         'gfx/pango_util.h',
         'gfx/pango_util.cc',
         'gfx/path.cc',
         'gfx/path.h',
         'gfx/path_aura.cc',
         'gfx/path_gtk.cc',
         'gfx/path_win.cc',
         'gfx/platform_font.h',
         'gfx/platform_font_android.cc',
@@ skipping 88 matching lines @@
             ['exclude', 'base/x/active_window_watcher_x.h'],
             ['exclude', 'base/x/active_window_watcher_x_observer.h'],
             ['exclude', 'base/x/root_window_property_watcher_x.cc'],
             ['exclude', 'base/x/root_window_property_watcher_x.h'],
             ['exclude', 'base/x/work_area_watcher_x.cc'],
             ['exclude', 'base/x/work_area_watcher_x.h'],
             ['exclude', 'ui_controls_win.cc'],
            ],
         }, {  # use_aura!=1
           'sources!': [
-            'base/native_theme/native_theme_aura.cc',
-            'base/native_theme/native_theme_aura.h',
+            'gfx/native_theme_aura.cc',
+            'gfx/native_theme_aura.h',
             'base/cursor/cursor.cc',
             'base/cursor/cursor.h',
             'base/cursor/cursor_win.cc',
             'base/cursor/cursor_x11.cc',
           ]
         }],
         ['use_aura==1 and OS=="win"', {
           'sources/': [
             ['exclude', 'base/dragdrop/os_exchange_data_provider_win.cc'],
             ['exclude', 'base/dragdrop/os_exchange_data_provider_win.h'],
-            ['exclude', 'base/native_theme/native_theme_win.cc'],
-            ['exclude', 'base/native_theme/native_theme_win.h'],
+            ['exclude', 'gfx/native_theme_win.cc'],
+            ['exclude', 'gfx/native_theme_win.h'],
             ['exclude', 'gfx/path_win.cc'],
           ],
         }],
         ['use_aura==0 and toolkit_views==0', {
           'sources/': [
             ['exclude', '^base/gestures/*'],
           ]
         }],
         ['use_ibus==1', {
           'dependencies': [
@@ skipping 48 matching lines @@
             'gfx/gtk_native_view_id_manager.h',
             'gfx/gtk_preserve_window.cc',
             'gfx/gtk_preserve_window.h',
             'gfx/gtk_util.cc',
             'gfx/gtk_util.h',
             'gfx/image/cairo_cached_surface.cc',
             'gfx/image/cairo_cached_surface.h',
           ],
         }, {  # toolkit_uses_gtk != 1
           'sources!': [
-            'base/native_theme/native_theme_gtk.cc',
-            'base/native_theme/native_theme_gtk.h',
+            'gfx/native_theme_gtk.cc',
+            'gfx/native_theme_gtk.h',
           ]
         }],
         ['OS=="win"', {
           'sources': [
-            'base/native_theme/native_theme_win.cc',
-            'base/native_theme/native_theme_win.h',
             'gfx/gdi_util.cc',
             'gfx/gdi_util.h',
             'gfx/icon_util.cc',
             'gfx/icon_util.h',
+            'gfx/native_theme_win.cc',
+            'gfx/native_theme_win.h',
           ],
           'sources!': [
             'base/touch/touch_factory.cc',
             'base/touch/touch_factory.h',
             'gfx/pango_util.h',
             'gfx/pango_util.cc',
             'gfx/platform_font_pango.cc',
             'gfx/platform_font_pango.h',
           ],
           'include_dirs': [
@@ skipping 28 matching lines @@
               ],
             }],
           ],
           'sources!': [
             'base/dragdrop/drag_source.cc',
             'base/dragdrop/drag_source.h',
             'base/dragdrop/drag_drop_types.h',
             'base/dragdrop/drop_target.cc',
             'base/dragdrop/drop_target.h',
             'base/dragdrop/os_exchange_data.cc',
-            'base/native_theme/native_theme_win.cc',
-            'base/native_theme/native_theme_win.h',
+            'gfx/native_theme_win.cc',
+            'gfx/native_theme_win.h',
           ],
           'sources/': [
             ['exclude', '^base/win/*'],
           ],
         }],
         ['OS=="mac"', {
           'sources!': [
             'base/dragdrop/drag_utils.cc',
             'base/dragdrop/drag_utils.h',
             'base/touch/touch_factory.cc',
@@ skipping 122 matching lines @@
                 'shutil.copyfile(\'<(ui_copy_target)\', \'<(ui_copy_dest)\'); ' \
                 'os.chmod(\'<(ui_copy_dest)\', 0700)'
               ]
             }
           ],
         },
       ],
     }],
   ],
 }