Move ResourceBundle, DataPack to ui/base

app/app_base.gypi

 # Copyright (c) 2011 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.
 
 {
   'target_defaults': {
     'variables': {
       'app_base_target': 0,
     },
     'target_conditions': [
       # This part is shared between the targets defined below. Only files and
       # settings relevant for building the Win64 target should be added here.
       # All the rest should be added to the 'app_base' target below.
       ['app_base_target==1', {
         'sources': [
             # Used both for Chrome and for Win64 NaCl loader
             '../ui/base/models/tree_model.cc',
             '../ui/base/models/tree_model.h',
             '../ui/base/models/tree_node_iterator.h',
             '../ui/base/models/tree_node_model.h',
             '../ui/base/system_monitor/system_monitor.cc',
             '../ui/base/system_monitor/system_monitor.h',
             '../ui/base/system_monitor/system_monitor_mac.mm',
             '../ui/base/system_monitor/system_monitor_posix.cc',
             '../ui/base/system_monitor/system_monitor_win.cc',
+            '../ui/base/ui_base_paths.h',
+            '../ui/base/ui_base_paths.cc',
+            '../ui/base/ui_base_switches.h',
+            '../ui/base/ui_base_switches.cc',
             'app_paths.h',
             'app_paths.cc',
             'app_switches.h',
             'app_switches.cc',
         ],
         'conditions': [
           ['OS!="linux" and OS!="freebsd" and OS!="openbsd"', {
             'sources!': [
               '../ui/base/dragdrop/gtk_dnd_util.cc',
               '../ui/base/dragdrop/gtk_dnd_util.h',
@@ skipping 118 matching lines @@
         '../ui/base/models/button_menu_item_model.cc',
         '../ui/base/models/button_menu_item_model.h',
         '../ui/base/models/menu_model.cc',
         '../ui/base/models/menu_model.h',
         '../ui/base/models/simple_menu_model.cc',
         '../ui/base/models/simple_menu_model.h',
         '../ui/base/models/combobox_model.h',
         '../ui/base/models/table_model.cc',
         '../ui/base/models/table_model.h',
         '../ui/base/models/table_model_observer.h',
+        '../ui/base/resource/data_pack.cc',
+        '../ui/base/resource/data_pack.h',
+        '../ui/base/resource/resource_bundle.cc',
+        '../ui/base/resource/resource_bundle.h',
+        '../ui/base/resource/resource_bundle_linux.cc',
+        '../ui/base/resource/resource_bundle_mac.mm',
+        '../ui/base/resource/resource_bundle_posix.cc',
+        '../ui/base/resource/resource_bundle_win.cc',
         '../ui/base/text/text_elider.cc',
         '../ui/base/text/text_elider.h',
         '../ui/base/theme_provider.cc',
         '../ui/base/theme_provider.h',
         '../ui/base/view_prop.cc',
         '../ui/base/view_prop.h',
         '../ui/base/win/hwnd_util.cc',
         '../ui/base/win/hwnd_util.h',
         '../ui/base/win/window_impl.cc',
         '../ui/base/win/window_impl.h',
         '../ui/base/x/active_window_watcher_x.cc',
         '../ui/base/x/active_window_watcher_x.h',
         '../ui/base/x/x11_util.cc',
         '../ui/base/x/x11_util.h',
         '../ui/base/x/x11_util_internal.h',
-        'data_pack.cc',
-        'data_pack.h',
         'gfx/gl/gl_bindings.h',
         'gfx/gl/gl_context.cc',
         'gfx/gl/gl_context.h',
         'gfx/gl/gl_context_linux.cc',
         'gfx/gl/gl_context_mac.cc',
         'gfx/gl/gl_context_osmesa.cc',
         'gfx/gl/gl_context_osmesa.h',
         'gfx/gl/gl_context_stub.cc',
         'gfx/gl/gl_context_stub.h',
         'gfx/gl/gl_context_win.cc',
         'gfx/gl/gl_headers.h',
         'gfx/gl/gl_implementation.cc',
         'gfx/gl/gl_implementation.h',
         'gfx/gl/gl_implementation_linux.cc',
         'gfx/gl/gl_implementation_mac.cc',
         'gfx/gl/gl_implementation_win.cc',
         'gfx/gl/gl_interface.h',
         'gfx/gl/gl_interface.cc',
         'l10n_util.cc',
         'l10n_util.h',
         'l10n_util_collator.h',
         'l10n_util_mac.h',
         'l10n_util_mac.mm',
         'l10n_util_posix.cc',
         'l10n_util_win.cc',
         'l10n_util_win.h',
         'mac/nsimage_cache.h',
         'mac/nsimage_cache.mm',
         'mac/scoped_nsdisable_screen_updates.h',
-        'resource_bundle.cc',
-        'resource_bundle.h',
-        'resource_bundle_linux.cc',
-        'resource_bundle_mac.mm',
-        'resource_bundle_posix.cc',
-        'resource_bundle_win.cc',
         'sql/connection.cc',
         'sql/connection.h',
         'sql/diagnostic_error_delegate.h',
         'sql/init_status.h',
         'sql/meta_table.cc',
         'sql/meta_table.h',
         'sql/statement.cc',
         'sql/statement.h',
         'sql/transaction.cc',
         'sql/transaction.h',
@@ skipping 89 matching lines @@
           ],
         }],
         ['OS!="win"', {
           'sources!': [
             '../ui/base/dragdrop/drag_source.cc',
             '../ui/base/dragdrop/drag_source.h',
             '../ui/base/dragdrop/drag_drop_types.h',
             '../ui/base/dragdrop/drop_target.cc',
             '../ui/base/dragdrop/drop_target.h',
             '../ui/base/dragdrop/os_exchange_data.cc',
-            'view_prop.cc',
-            'view_prop.h',
+            '../ui/base/view_prop.cc',
+            '../ui/base/view_prop.h',
             'win/iat_patch_function.cc',
             'win/iat_patch_function.h',
           ],
           'sources/': [
             ['exclude', '^win/*'],
           ],
         }],
         ['OS=="linux"', {
           'sources': [
             'gfx/gl/gl_context_egl.cc',
@@ skipping 91 matching lines @@
             '<@(nacl_win64_defines)',
           ],
           # TODO(gregoryd): The direct_dependent_settings should be shared with
           # the 32-bit target, but it doesn't work due to a bug in gyp
           'direct_dependent_settings': {
             'include_dirs': [
               '..',
             ],
           },
           'sources': [
-            'resource_bundle_dummy.cc',
+            '../ui/base/resource/resource_bundle_dummy.cc',
           ],
           'include_dirs': [
             '../skia/config/win',
             '../third_party/icu/public/common',
             '../third_party/icu/public/i18n',
             '../third_party/npapi',
             '../third_party/skia/include/config',
             '../third_party/skia/include/core',
           ],
           'configurations': {
             'Common_Base': {
               'msvs_target_platform': 'x64',
             },
           },
         },
       ],
     }],
   ],
 }