Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(291)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/base/ui_base.gyp

Issue 198333004: Move ui.gyp into ui/base/ directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: REBASED Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/aura/aura.gyp ('k') | ui/compositor/compositor.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/ui_base.gyp
diff --git a/ui/ui.gyp b/ui/base/ui_base.gyp
similarity index 25%
rename from ui/ui.gyp
rename to ui/base/ui_base.gyp
index 1050f45750c355b666bbd628f463e3ddc1b807fa..93f4e56dd65686cbc62cf2249c147c83d7dc63a6 100644
--- a/ui/ui.gyp
+++ b/ui/base/ui_base.gyp
@@ -8,334 +8,334 @@
},
'targets': [
{
- 'target_name': 'ui',
+ 'target_name': 'ui_base',
'type': '<(component)',
'dependencies': [
- '../base/base.gyp:base',
- '../base/base.gyp:base_i18n',
- '../base/base.gyp:base_static',
- '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
- '../net/net.gyp:net',
- '../skia/skia.gyp:skia',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
- '../url/url.gyp:url_lib',
- 'base/strings/ui_strings.gyp:ui_strings',
- 'events/events.gyp:events_base',
- 'gfx/gfx.gyp:gfx',
- 'gfx/gfx.gyp:gfx_geometry',
- 'resources/ui_resources.gyp:ui_resources',
+ '../../base/base.gyp:base',
+ '../../base/base.gyp:base_i18n',
+ '../../base/base.gyp:base_static',
+ '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+ '../../net/net.gyp:net',
+ '../../skia/skia.gyp:skia',
+ '../../third_party/icu/icu.gyp:icui18n',
+ '../../third_party/icu/icu.gyp:icuuc',
+ '../../url/url.gyp:url_lib',
+ '../events/events.gyp:events_base',
+ '../gfx/gfx.gyp:gfx',
+ '../gfx/gfx.gyp:gfx_geometry',
+ '../resources/ui_resources.gyp:ui_resources',
+ 'strings/ui_strings.gyp:ui_strings',
],
'defines': [
'UI_BASE_IMPLEMENTATION',
],
'export_dependent_settings': [
- '../net/net.gyp:net',
- 'gfx/gfx.gyp:gfx',
+ '../../net/net.gyp:net',
+ '../gfx/gfx.gyp:gfx',
],
'sources' : [
- 'base/accelerators/accelerator.cc',
- 'base/accelerators/accelerator.h',
- 'base/accelerators/accelerator_manager.cc',
- 'base/accelerators/accelerator_manager.h',
- 'base/accelerators/menu_label_accelerator_util_linux.cc',
- 'base/accelerators/menu_label_accelerator_util_linux.h',
- 'base/accelerators/platform_accelerator.h',
- 'base/accelerators/platform_accelerator_cocoa.h',
- 'base/accelerators/platform_accelerator_cocoa.mm',
- 'base/accelerators/platform_accelerator_gtk.cc',
- 'base/accelerators/platform_accelerator_gtk.h',
- 'base/android/ui_base_jni_registrar.cc',
- 'base/android/ui_base_jni_registrar.h',
- 'base/android/view_android.cc',
- 'base/android/view_android.h',
- 'base/android/window_android.cc',
- 'base/android/window_android.h',
- 'base/android/window_android_observer.h',
- 'base/base_window.cc',
- 'base/base_window.h',
- 'base/clipboard/clipboard.cc',
- 'base/clipboard/clipboard.h',
- 'base/clipboard/clipboard_android.cc',
- 'base/clipboard/clipboard_android_initialization.h',
- 'base/clipboard/clipboard_aura.cc',
- 'base/clipboard/clipboard_aurax11.cc',
- 'base/clipboard/clipboard_constants.cc',
- 'base/clipboard/clipboard_gtk.cc',
- 'base/clipboard/clipboard_mac.mm',
- 'base/clipboard/clipboard_types.h',
- 'base/clipboard/clipboard_util_win.cc',
- 'base/clipboard/clipboard_util_win.h',
- 'base/clipboard/clipboard_win.cc',
- 'base/clipboard/custom_data_helper.cc',
- 'base/clipboard/custom_data_helper.h',
- 'base/clipboard/custom_data_helper_linux.cc',
- 'base/clipboard/custom_data_helper_mac.mm',
- 'base/clipboard/scoped_clipboard_writer.cc',
- 'base/clipboard/scoped_clipboard_writer.h',
- 'base/cocoa/animation_utils.h',
- 'base/cocoa/appkit_utils.h',
- 'base/cocoa/appkit_utils.mm',
- 'base/cocoa/base_view.h',
- 'base/cocoa/base_view.mm',
- 'base/cocoa/cocoa_base_utils.h',
- 'base/cocoa/cocoa_base_utils.mm',
- 'base/cocoa/controls/blue_label_button.h',
- 'base/cocoa/controls/blue_label_button.mm',
- 'base/cocoa/controls/hover_image_menu_button.h',
- 'base/cocoa/controls/hover_image_menu_button.mm',
- 'base/cocoa/controls/hover_image_menu_button_cell.h',
- 'base/cocoa/controls/hover_image_menu_button_cell.mm',
- 'base/cocoa/controls/hyperlink_button_cell.h',
- 'base/cocoa/controls/hyperlink_button_cell.mm',
- 'base/cocoa/find_pasteboard.h',
- 'base/cocoa/find_pasteboard.mm',
- 'base/cocoa/flipped_view.h',
- 'base/cocoa/flipped_view.mm',
- 'base/cocoa/focus_tracker.h',
- 'base/cocoa/focus_tracker.mm',
- 'base/cocoa/focus_window_set.h',
- 'base/cocoa/focus_window_set.mm',
- 'base/cocoa/fullscreen_window_manager.h',
- 'base/cocoa/fullscreen_window_manager.mm',
- 'base/cocoa/hover_button.h',
- 'base/cocoa/hover_button.mm',
- 'base/cocoa/hover_image_button.h',
- 'base/cocoa/hover_image_button.mm',
- 'base/cocoa/menu_controller.h',
- 'base/cocoa/menu_controller.mm',
- 'base/cocoa/nib_loading.h',
- 'base/cocoa/nib_loading.mm',
- 'base/cocoa/nsgraphics_context_additions.h',
- 'base/cocoa/nsgraphics_context_additions.mm',
- 'base/cocoa/tracking_area.h',
- 'base/cocoa/tracking_area.mm',
- 'base/cocoa/underlay_opengl_hosting_window.h',
- 'base/cocoa/underlay_opengl_hosting_window.mm',
- 'base/cocoa/view_description.h',
- 'base/cocoa/view_description.mm',
- 'base/cocoa/window_size_constants.h',
- 'base/cocoa/window_size_constants.mm',
- 'base/cursor/cursor.cc',
- 'base/cursor/cursor.h',
- 'base/cursor/cursor_android.cc',
- 'base/cursor/cursor_loader.h',
- 'base/cursor/cursor_loader_ozone.cc',
- 'base/cursor/cursor_loader_ozone.h',
- 'base/cursor/cursor_loader_win.cc',
- 'base/cursor/cursor_loader_win.h',
- 'base/cursor/cursor_loader_x11.cc',
- 'base/cursor/cursor_loader_x11.h',
- 'base/cursor/cursor_ozone.cc',
- 'base/cursor/cursor_mac.mm',
- 'base/cursor/cursor_win.cc',
- 'base/cursor/cursor_x11.cc',
- 'base/cursor/cursors_aura.cc',
- 'base/cursor/cursors_aura.h',
- 'base/cursor/ozone/cursor_factory_ozone.cc',
- 'base/cursor/ozone/cursor_factory_ozone.h',
- 'base/default_theme_provider.cc',
- 'base/default_theme_provider.h',
- 'base/default_theme_provider_mac.mm',
- 'base/device_form_factor_android.cc',
- 'base/device_form_factor_desktop.cc',
- 'base/device_form_factor_ios.mm',
- 'base/device_form_factor.h',
- 'base/dragdrop/cocoa_dnd_util.h',
- 'base/dragdrop/cocoa_dnd_util.mm',
- 'base/dragdrop/drag_drop_types.h',
- 'base/dragdrop/drag_drop_types_win.cc',
- 'base/dragdrop/drag_source_win.cc',
- 'base/dragdrop/drag_source_win.h',
- 'base/dragdrop/drag_utils.cc',
- 'base/dragdrop/drag_utils.h',
- 'base/dragdrop/drag_utils_aura.cc',
- 'base/dragdrop/drag_utils_win.cc',
- 'base/dragdrop/drop_target_event.cc',
- 'base/dragdrop/drop_target_event.h',
- 'base/dragdrop/drop_target_win.cc',
- 'base/dragdrop/drop_target_win.h',
- 'base/dragdrop/gtk_dnd_util.cc',
- 'base/dragdrop/gtk_dnd_util.h',
- 'base/dragdrop/os_exchange_data.cc',
- 'base/dragdrop/os_exchange_data.h',
- 'base/dragdrop/os_exchange_data_provider_aura.cc',
- 'base/dragdrop/os_exchange_data_provider_aura.h',
- 'base/dragdrop/os_exchange_data_provider_aurax11.cc',
- 'base/dragdrop/os_exchange_data_provider_aurax11.h',
- 'base/dragdrop/os_exchange_data_provider_win.cc',
- 'base/dragdrop/os_exchange_data_provider_win.h',
- 'base/gtk/event_synthesis_gtk.cc',
- 'base/gtk/event_synthesis_gtk.h',
- 'base/gtk/focus_store_gtk.cc',
- 'base/gtk/focus_store_gtk.h',
- 'base/gtk/g_object_destructor_filo.cc',
- 'base/gtk/g_object_destructor_filo.h',
- 'base/gtk/gtk_expanded_container.cc',
- 'base/gtk/gtk_expanded_container.h',
- 'base/gtk/gtk_floating_container.cc',
- 'base/gtk/gtk_floating_container.h',
- 'base/gtk/gtk_hig_constants.h',
- 'base/gtk/gtk_screen_util.cc',
- 'base/gtk/gtk_screen_util.h',
- 'base/gtk/gtk_signal.h',
- 'base/gtk/gtk_signal_registrar.cc',
- 'base/gtk/gtk_signal_registrar.h',
- 'base/gtk/gtk_windowing.cc',
- 'base/gtk/gtk_windowing.h',
- 'base/gtk/owned_widget_gtk.cc',
- 'base/gtk/owned_widget_gtk.h',
- 'base/gtk/scoped_region.cc',
- 'base/gtk/scoped_region.h',
- 'base/hit_test.h',
- 'base/l10n/formatter.cc',
- 'base/l10n/formatter.h',
- 'base/l10n/l10n_font_util.cc',
- 'base/l10n/l10n_font_util.h',
- 'base/l10n/l10n_util.cc',
- 'base/l10n/l10n_util.h',
- 'base/l10n/l10n_util_android.cc',
- 'base/l10n/l10n_util_android.h',
- 'base/l10n/l10n_util_collator.h',
- 'base/l10n/l10n_util_mac.h',
- 'base/l10n/l10n_util_mac.mm',
- 'base/l10n/l10n_util_plurals.cc',
- 'base/l10n/l10n_util_plurals.h',
- 'base/l10n/l10n_util_posix.cc',
- 'base/l10n/l10n_util_win.cc',
- 'base/l10n/l10n_util_win.h',
- 'base/l10n/time_format.cc',
- 'base/l10n/time_format.h',
- 'base/layout.cc',
- 'base/layout.h',
- 'base/layout_mac.mm',
- 'base/models/button_menu_item_model.cc',
- 'base/models/button_menu_item_model.h',
- 'base/models/combobox_model.cc',
- 'base/models/combobox_model.h',
- 'base/models/combobox_model_observer.h',
- 'base/models/dialog_model.cc',
- 'base/models/dialog_model.h',
- 'base/models/list_model.h',
- 'base/models/list_model_observer.h',
- 'base/models/list_selection_model.cc',
- 'base/models/list_selection_model.h',
- 'base/models/menu_model.cc',
- 'base/models/menu_model.h',
- 'base/models/menu_model_delegate.h',
- 'base/models/menu_separator_types.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/nine_image_painter_factory.cc',
- 'base/nine_image_painter_factory.h',
- '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_auralinux.cc',
- 'base/resource/resource_bundle_gtk.cc',
- 'base/resource/resource_bundle_ios.mm',
- 'base/resource/resource_bundle_mac.mm',
- 'base/resource/resource_bundle_win.cc',
- 'base/resource/resource_bundle_win.h',
- 'base/resource/resource_data_dll_win.cc',
- 'base/resource/resource_data_dll_win.h',
- 'base/resource/resource_handle.h',
- 'base/text/bytes_formatting.cc',
- 'base/text/bytes_formatting.h',
- 'base/theme_provider.cc',
- 'base/theme_provider.h',
- 'base/touch/touch_device.cc',
- 'base/touch/touch_device.h',
- 'base/touch/touch_device_android.cc',
- 'base/touch/touch_device_aurax11.cc',
- 'base/touch/touch_device_ozone.cc',
- 'base/touch/touch_device_win.cc',
- 'base/touch/touch_editing_controller.cc',
- 'base/touch/touch_editing_controller.h',
- 'base/touch/touch_enabled.cc',
- 'base/touch/touch_enabled.h',
- 'base/ui_base_exports.cc',
- 'base/ui_base_paths.cc',
- 'base/ui_base_paths.h',
- 'base/ui_base_switches.cc',
- 'base/ui_base_switches.h',
- 'base/ui_base_switches_util.cc',
- 'base/ui_base_switches_util.h',
- 'base/ui_base_types.cc',
- 'base/ui_base_types.h',
- 'base/ui_base_export.h',
- 'base/view_prop.cc',
- 'base/view_prop.h',
- 'base/webui/jstemplate_builder.cc',
- 'base/webui/jstemplate_builder.h',
- 'base/webui/web_ui_util.cc',
- 'base/webui/web_ui_util.h',
- 'base/win/accessibility_ids_win.h',
- 'base/win/accessibility_misc_utils.cc',
- 'base/win/accessibility_misc_utils.h',
- 'base/win/atl_module.h',
- 'base/win/dpi_setup.cc',
- 'base/win/dpi_setup.h',
- 'base/win/foreground_helper.cc',
- 'base/win/foreground_helper.h',
- 'base/win/hidden_window.cc',
- 'base/win/hidden_window.h',
- 'base/win/hwnd_subclass.cc',
- 'base/win/hwnd_subclass.h',
- 'base/win/lock_state.cc',
- 'base/win/lock_state.h',
- 'base/win/message_box_win.cc',
- 'base/win/message_box_win.h',
- 'base/win/mouse_wheel_util.cc',
- 'base/win/mouse_wheel_util.h',
- 'base/win/scoped_ole_initializer.cc',
- 'base/win/scoped_ole_initializer.h',
- 'base/win/shell.cc',
- 'base/win/shell.h',
- 'base/win/touch_input.cc',
- 'base/win/touch_input.h',
- 'base/win/window_event_target.cc',
- 'base/win/window_event_target.h',
- 'base/window_open_disposition.cc',
- 'base/window_open_disposition.h',
- 'base/work_area_watcher_observer.h',
- 'base/x/active_window_watcher_x.cc',
- 'base/x/active_window_watcher_x.h',
- 'base/x/active_window_watcher_x_observer.h',
- 'base/x/root_window_property_watcher_x.cc',
- 'base/x/root_window_property_watcher_x.h',
- 'base/x/selection_owner.cc',
- 'base/x/selection_owner.h',
- 'base/x/selection_requestor.cc',
- 'base/x/selection_requestor.h',
- 'base/x/selection_utils.cc',
- 'base/x/selection_utils.h',
- 'base/x/work_area_watcher_x.cc',
- 'base/x/work_area_watcher_x.h',
- 'base/x/x11_util.cc',
- 'base/x/x11_util.h',
- 'base/x/x11_util_internal.h',
+ 'accelerators/accelerator.cc',
+ 'accelerators/accelerator.h',
+ 'accelerators/accelerator_manager.cc',
+ 'accelerators/accelerator_manager.h',
+ 'accelerators/menu_label_accelerator_util_linux.cc',
+ 'accelerators/menu_label_accelerator_util_linux.h',
+ 'accelerators/platform_accelerator.h',
+ 'accelerators/platform_accelerator_cocoa.h',
+ 'accelerators/platform_accelerator_cocoa.mm',
+ 'accelerators/platform_accelerator_gtk.cc',
+ 'accelerators/platform_accelerator_gtk.h',
+ 'android/ui_base_jni_registrar.cc',
+ 'android/ui_base_jni_registrar.h',
+ 'android/view_android.cc',
+ 'android/view_android.h',
+ 'android/window_android.cc',
+ 'android/window_android.h',
+ 'android/window_android_observer.h',
+ 'base_window.cc',
+ 'base_window.h',
+ 'clipboard/clipboard.cc',
+ 'clipboard/clipboard.h',
+ 'clipboard/clipboard_android.cc',
+ 'clipboard/clipboard_android_initialization.h',
+ 'clipboard/clipboard_aura.cc',
+ 'clipboard/clipboard_aurax11.cc',
+ 'clipboard/clipboard_constants.cc',
+ 'clipboard/clipboard_gtk.cc',
+ 'clipboard/clipboard_mac.mm',
+ 'clipboard/clipboard_types.h',
+ 'clipboard/clipboard_util_win.cc',
+ 'clipboard/clipboard_util_win.h',
+ 'clipboard/clipboard_win.cc',
+ 'clipboard/custom_data_helper.cc',
+ 'clipboard/custom_data_helper.h',
+ 'clipboard/custom_data_helper_linux.cc',
+ 'clipboard/custom_data_helper_mac.mm',
+ 'clipboard/scoped_clipboard_writer.cc',
+ 'clipboard/scoped_clipboard_writer.h',
+ 'cocoa/animation_utils.h',
+ 'cocoa/appkit_utils.h',
+ 'cocoa/appkit_utils.mm',
+ 'cocoa/base_view.h',
+ 'cocoa/base_view.mm',
+ 'cocoa/cocoa_base_utils.h',
+ 'cocoa/cocoa_base_utils.mm',
+ 'cocoa/controls/blue_label_button.h',
+ 'cocoa/controls/blue_label_button.mm',
+ 'cocoa/controls/hover_image_menu_button.h',
+ 'cocoa/controls/hover_image_menu_button.mm',
+ 'cocoa/controls/hover_image_menu_button_cell.h',
+ 'cocoa/controls/hover_image_menu_button_cell.mm',
+ 'cocoa/controls/hyperlink_button_cell.h',
+ 'cocoa/controls/hyperlink_button_cell.mm',
+ 'cocoa/find_pasteboard.h',
+ 'cocoa/find_pasteboard.mm',
+ 'cocoa/flipped_view.h',
+ 'cocoa/flipped_view.mm',
+ 'cocoa/focus_tracker.h',
+ 'cocoa/focus_tracker.mm',
+ 'cocoa/focus_window_set.h',
+ 'cocoa/focus_window_set.mm',
+ 'cocoa/fullscreen_window_manager.h',
+ 'cocoa/fullscreen_window_manager.mm',
+ 'cocoa/hover_button.h',
+ 'cocoa/hover_button.mm',
+ 'cocoa/hover_image_button.h',
+ 'cocoa/hover_image_button.mm',
+ 'cocoa/menu_controller.h',
+ 'cocoa/menu_controller.mm',
+ 'cocoa/nib_loading.h',
+ 'cocoa/nib_loading.mm',
+ 'cocoa/nsgraphics_context_additions.h',
+ 'cocoa/nsgraphics_context_additions.mm',
+ 'cocoa/tracking_area.h',
+ 'cocoa/tracking_area.mm',
+ 'cocoa/underlay_opengl_hosting_window.h',
+ 'cocoa/underlay_opengl_hosting_window.mm',
+ 'cocoa/view_description.h',
+ 'cocoa/view_description.mm',
+ 'cocoa/window_size_constants.h',
+ 'cocoa/window_size_constants.mm',
+ 'cursor/cursor.cc',
+ 'cursor/cursor.h',
+ 'cursor/cursor_android.cc',
+ 'cursor/cursor_loader.h',
+ 'cursor/cursor_loader_ozone.cc',
+ 'cursor/cursor_loader_ozone.h',
+ 'cursor/cursor_loader_win.cc',
+ 'cursor/cursor_loader_win.h',
+ 'cursor/cursor_loader_x11.cc',
+ 'cursor/cursor_loader_x11.h',
+ 'cursor/cursor_ozone.cc',
+ 'cursor/cursor_mac.mm',
+ 'cursor/cursor_win.cc',
+ 'cursor/cursor_x11.cc',
+ 'cursor/cursors_aura.cc',
+ 'cursor/cursors_aura.h',
+ 'cursor/ozone/cursor_factory_ozone.cc',
+ 'cursor/ozone/cursor_factory_ozone.h',
+ 'default_theme_provider.cc',
+ 'default_theme_provider.h',
+ 'default_theme_provider_mac.mm',
+ 'device_form_factor_android.cc',
+ 'device_form_factor_desktop.cc',
+ 'device_form_factor_ios.mm',
+ 'device_form_factor.h',
+ 'dragdrop/cocoa_dnd_util.h',
+ 'dragdrop/cocoa_dnd_util.mm',
+ 'dragdrop/drag_drop_types.h',
+ 'dragdrop/drag_drop_types_win.cc',
+ 'dragdrop/drag_source_win.cc',
+ 'dragdrop/drag_source_win.h',
+ 'dragdrop/drag_utils.cc',
+ 'dragdrop/drag_utils.h',
+ 'dragdrop/drag_utils_aura.cc',
+ 'dragdrop/drag_utils_win.cc',
+ 'dragdrop/drop_target_event.cc',
+ 'dragdrop/drop_target_event.h',
+ 'dragdrop/drop_target_win.cc',
+ 'dragdrop/drop_target_win.h',
+ 'dragdrop/gtk_dnd_util.cc',
+ 'dragdrop/gtk_dnd_util.h',
+ 'dragdrop/os_exchange_data.cc',
+ 'dragdrop/os_exchange_data.h',
+ 'dragdrop/os_exchange_data_provider_aura.cc',
+ 'dragdrop/os_exchange_data_provider_aura.h',
+ 'dragdrop/os_exchange_data_provider_aurax11.cc',
+ 'dragdrop/os_exchange_data_provider_aurax11.h',
+ 'dragdrop/os_exchange_data_provider_win.cc',
+ 'dragdrop/os_exchange_data_provider_win.h',
+ 'gtk/event_synthesis_gtk.cc',
+ 'gtk/event_synthesis_gtk.h',
+ 'gtk/focus_store_gtk.cc',
+ 'gtk/focus_store_gtk.h',
+ 'gtk/g_object_destructor_filo.cc',
+ 'gtk/g_object_destructor_filo.h',
+ 'gtk/gtk_expanded_container.cc',
+ 'gtk/gtk_expanded_container.h',
+ 'gtk/gtk_floating_container.cc',
+ 'gtk/gtk_floating_container.h',
+ 'gtk/gtk_hig_constants.h',
+ 'gtk/gtk_screen_util.cc',
+ 'gtk/gtk_screen_util.h',
+ 'gtk/gtk_signal.h',
+ 'gtk/gtk_signal_registrar.cc',
+ 'gtk/gtk_signal_registrar.h',
+ 'gtk/gtk_windowing.cc',
+ 'gtk/gtk_windowing.h',
+ 'gtk/owned_widget_gtk.cc',
+ 'gtk/owned_widget_gtk.h',
+ 'gtk/scoped_region.cc',
+ 'gtk/scoped_region.h',
+ 'hit_test.h',
+ 'l10n/formatter.cc',
+ 'l10n/formatter.h',
+ 'l10n/l10n_font_util.cc',
+ 'l10n/l10n_font_util.h',
+ 'l10n/l10n_util.cc',
+ 'l10n/l10n_util.h',
+ 'l10n/l10n_util_android.cc',
+ 'l10n/l10n_util_android.h',
+ 'l10n/l10n_util_collator.h',
+ 'l10n/l10n_util_mac.h',
+ 'l10n/l10n_util_mac.mm',
+ 'l10n/l10n_util_plurals.cc',
+ 'l10n/l10n_util_plurals.h',
+ 'l10n/l10n_util_posix.cc',
+ 'l10n/l10n_util_win.cc',
+ 'l10n/l10n_util_win.h',
+ 'l10n/time_format.cc',
+ 'l10n/time_format.h',
+ 'layout.cc',
+ 'layout.h',
+ 'layout_mac.mm',
+ 'models/button_menu_item_model.cc',
+ 'models/button_menu_item_model.h',
+ 'models/combobox_model.cc',
+ 'models/combobox_model.h',
+ 'models/combobox_model_observer.h',
+ 'models/dialog_model.cc',
+ 'models/dialog_model.h',
+ 'models/list_model.h',
+ 'models/list_model_observer.h',
+ 'models/list_selection_model.cc',
+ 'models/list_selection_model.h',
+ 'models/menu_model.cc',
+ 'models/menu_model.h',
+ 'models/menu_model_delegate.h',
+ 'models/menu_separator_types.h',
+ 'models/simple_menu_model.cc',
+ 'models/simple_menu_model.h',
+ 'models/table_model.cc',
+ 'models/table_model.h',
+ 'models/table_model_observer.h',
+ 'models/tree_model.cc',
+ 'models/tree_model.h',
+ 'models/tree_node_iterator.h',
+ 'models/tree_node_model.h',
+ 'nine_image_painter_factory.cc',
+ 'nine_image_painter_factory.h',
+ 'resource/data_pack.cc',
+ 'resource/data_pack.h',
+ 'resource/resource_bundle.cc',
+ 'resource/resource_bundle.h',
+ 'resource/resource_bundle_android.cc',
+ 'resource/resource_bundle_auralinux.cc',
+ 'resource/resource_bundle_gtk.cc',
+ 'resource/resource_bundle_ios.mm',
+ 'resource/resource_bundle_mac.mm',
+ 'resource/resource_bundle_win.cc',
+ 'resource/resource_bundle_win.h',
+ 'resource/resource_data_dll_win.cc',
+ 'resource/resource_data_dll_win.h',
+ 'resource/resource_handle.h',
+ 'text/bytes_formatting.cc',
+ 'text/bytes_formatting.h',
+ 'theme_provider.cc',
+ 'theme_provider.h',
+ 'touch/touch_device.cc',
+ 'touch/touch_device.h',
+ 'touch/touch_device_android.cc',
+ 'touch/touch_device_aurax11.cc',
+ 'touch/touch_device_ozone.cc',
+ 'touch/touch_device_win.cc',
+ 'touch/touch_editing_controller.cc',
+ 'touch/touch_editing_controller.h',
+ 'touch/touch_enabled.cc',
+ 'touch/touch_enabled.h',
+ 'ui_base_exports.cc',
+ 'ui_base_paths.cc',
+ 'ui_base_paths.h',
+ 'ui_base_switches.cc',
+ 'ui_base_switches.h',
+ 'ui_base_switches_util.cc',
+ 'ui_base_switches_util.h',
+ 'ui_base_types.cc',
+ 'ui_base_types.h',
+ 'ui_base_export.h',
+ 'view_prop.cc',
+ 'view_prop.h',
+ 'webui/jstemplate_builder.cc',
+ 'webui/jstemplate_builder.h',
+ 'webui/web_ui_util.cc',
+ 'webui/web_ui_util.h',
+ 'win/accessibility_ids_win.h',
+ 'win/accessibility_misc_utils.cc',
+ 'win/accessibility_misc_utils.h',
+ 'win/atl_module.h',
+ 'win/dpi_setup.cc',
+ 'win/dpi_setup.h',
+ 'win/foreground_helper.cc',
+ 'win/foreground_helper.h',
+ 'win/hidden_window.cc',
+ 'win/hidden_window.h',
+ 'win/hwnd_subclass.cc',
+ 'win/hwnd_subclass.h',
+ 'win/lock_state.cc',
+ 'win/lock_state.h',
+ 'win/message_box_win.cc',
+ 'win/message_box_win.h',
+ 'win/mouse_wheel_util.cc',
+ 'win/mouse_wheel_util.h',
+ 'win/scoped_ole_initializer.cc',
+ 'win/scoped_ole_initializer.h',
+ 'win/shell.cc',
+ 'win/shell.h',
+ 'win/touch_input.cc',
+ 'win/touch_input.h',
+ 'win/window_event_target.cc',
+ 'win/window_event_target.h',
+ 'window_open_disposition.cc',
+ 'window_open_disposition.h',
+ 'work_area_watcher_observer.h',
+ 'x/active_window_watcher_x.cc',
+ 'x/active_window_watcher_x.h',
+ 'x/active_window_watcher_x_observer.h',
+ 'x/root_window_property_watcher_x.cc',
+ 'x/root_window_property_watcher_x.h',
+ 'x/selection_owner.cc',
+ 'x/selection_owner.h',
+ 'x/selection_requestor.cc',
+ 'x/selection_requestor.h',
+ 'x/selection_utils.cc',
+ 'x/selection_utils.h',
+ 'x/work_area_watcher_x.cc',
+ 'x/work_area_watcher_x.h',
+ 'x/x11_util.cc',
+ 'x/x11_util.h',
+ 'x/x11_util_internal.h',
],
'target_conditions': [
['OS == "ios"', {
'sources/': [
- ['include', '^base/l10n/l10n_util_mac\\.mm$'],
+ ['include', '^l10n/l10n_util_mac\\.mm$'],
],
}],
],
'conditions': [
['OS!="ios"', {
'includes': [
- 'base/ime/ime.gypi',
+ 'ime/ime.gypi',
],
}, { # OS=="ios"
# iOS only uses a subset of UI.
@@ -343,10 +343,10 @@
['exclude', '\\.(cc|mm)$'],
['include', '_ios\\.(cc|mm)$'],
['include', '(^|/)ios/'],
- ['include', '^base/l10n/'],
- ['include', '^base/layout'],
- ['include', '^base/resource/'],
- ['include', '^base/ui_base_'],
+ ['include', '^l10n/'],
+ ['include', '^layout'],
+ ['include', '^resource/'],
+ ['include', '^ui_base_'],
],
'link_settings': {
'libraries': [
@@ -356,59 +356,59 @@
}],
['toolkit_views==1', {
'dependencies': [
- 'events/events.gyp:events',
+ '../events/events.gyp:events',
],
}],
['use_aura==1', {
'sources/': [
- ['exclude', 'base/clipboard/clipboard_mac.mm'],
- ['exclude', 'base/layout_mac.mm'],
- ['exclude', 'base/work_area_watcher_observer.h'],
- ['exclude', 'base/x/active_window_watcher_x.cc'],
- ['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', 'clipboard/clipboard_mac.mm'],
+ ['exclude', 'layout_mac.mm'],
+ ['exclude', 'work_area_watcher_observer.h'],
+ ['exclude', 'x/active_window_watcher_x.cc'],
+ ['exclude', 'x/active_window_watcher_x.h'],
+ ['exclude', 'x/active_window_watcher_x_observer.h'],
+ ['exclude', 'x/root_window_property_watcher_x.cc'],
+ ['exclude', 'x/root_window_property_watcher_x.h'],
+ ['exclude', 'x/work_area_watcher_x.cc'],
+ ['exclude', 'x/work_area_watcher_x.h'],
],
'dependencies': [
- 'events/events.gyp:events',
+ '../events/events.gyp:events',
],
}, { # use_aura!=1
'sources!': [
- 'base/cursor/cursor.cc',
- 'base/cursor/cursor.h',
- 'base/cursor/cursor_loader_x11.cc',
- 'base/cursor/cursor_loader_x11.h',
- 'base/cursor/cursor_mac.mm',
- 'base/cursor/cursor_win.cc',
- 'base/cursor/cursor_x11.cc',
- 'base/nine_image_painter_factory.cc',
- 'base/nine_image_painter_factory.h',
- 'base/x/selection_owner.cc',
- 'base/x/selection_owner.h',
- 'base/x/selection_requestor.cc',
- 'base/x/selection_requestor.h',
- 'base/x/selection_utils.cc',
- 'base/x/selection_utils.h',
+ 'cursor/cursor.cc',
+ 'cursor/cursor.h',
+ 'cursor/cursor_loader_x11.cc',
+ 'cursor/cursor_loader_x11.h',
+ 'cursor/cursor_mac.mm',
+ 'cursor/cursor_win.cc',
+ 'cursor/cursor_x11.cc',
+ 'nine_image_painter_factory.cc',
+ 'nine_image_painter_factory.h',
+ 'x/selection_owner.cc',
+ 'x/selection_owner.h',
+ 'x/selection_requestor.cc',
+ 'x/selection_requestor.h',
+ 'x/selection_utils.cc',
+ 'x/selection_utils.h',
]
}],
['use_aura==0 or OS!="linux"', {
'sources!': [
- 'base/resource/resource_bundle_auralinux.cc',
+ 'resource/resource_bundle_auralinux.cc',
],
}],
['use_aura==1 and OS=="win"', {
'sources/': [
- ['exclude', 'base/dragdrop/drag_utils_aura.cc'],
+ ['exclude', 'dragdrop/drag_utils_aura.cc'],
],
}],
['use_glib == 1', {
'dependencies': [
# font_gtk.cc uses fontconfig.
- '../build/linux/system.gyp:fontconfig',
- '../build/linux/system.gyp:glib',
+ '../../build/linux/system.gyp:fontconfig',
+ '../../build/linux/system.gyp:glib',
],
}],
['desktop_linux == 1 or chromeos == 1', {
@@ -417,53 +417,53 @@
# Note: because of gyp predence rules this has to be defined as
# 'sources/' rather than 'sources!'.
'sources/': [
- ['exclude', '^base/dragdrop/drag_utils.cc'],
- ['exclude', '^base/dragdrop/drag_utils.h'],
- ['exclude', '^base/dragdrop/os_exchange_data.cc'],
- ['exclude', '^base/dragdrop/os_exchange_data.h'],
+ ['exclude', '^dragdrop/drag_utils.cc'],
+ ['exclude', '^dragdrop/drag_utils.h'],
+ ['exclude', '^dragdrop/os_exchange_data.cc'],
+ ['exclude', '^dragdrop/os_exchange_data.h'],
],
}, {
# Note: because of gyp predence rules this has to be defined as
# 'sources/' rather than 'sources!'.
'sources/': [
- ['include', '^base/dragdrop/os_exchange_data.cc'],
+ ['include', '^dragdrop/os_exchange_data.cc'],
],
}],
],
}],
['use_pango==1', {
'dependencies': [
- '../build/linux/system.gyp:pangocairo',
+ '../../build/linux/system.gyp:pangocairo',
],
}],
['OS=="win" or use_clipboard_aurax11==1', {
'sources!': [
- 'base/clipboard/clipboard_aura.cc',
+ 'clipboard/clipboard_aura.cc',
],
}, {
'sources!': [
- 'base/clipboard/clipboard_aurax11.cc',
+ 'clipboard/clipboard_aurax11.cc',
],
}],
['chromeos==1 or (use_aura==1 and OS=="linux" and use_x11==0)', {
'sources!': [
- 'base/dragdrop/os_exchange_data_provider_aurax11.cc',
- 'base/touch/touch_device.cc',
+ 'dragdrop/os_exchange_data_provider_aurax11.cc',
+ 'touch/touch_device.cc',
],
}, {
'sources!': [
- 'base/dragdrop/os_exchange_data_provider_aura.cc',
- 'base/dragdrop/os_exchange_data_provider_aura.h',
- 'base/touch/touch_device_aurax11.cc',
+ 'dragdrop/os_exchange_data_provider_aura.cc',
+ 'dragdrop/os_exchange_data_provider_aura.h',
+ 'touch/touch_device_aurax11.cc',
],
}],
['OS=="win"', {
'sources!': [
- 'base/touch/touch_device.cc',
+ 'touch/touch_device.cc',
],
'include_dirs': [
- '../',
- '../third_party/wtl/include',
+ '../..',
+ '../../third_party/wtl/include',
],
# TODO(jschuh): C4267: http://crbug.com/167187 size_t -> int
# C4324 is structure was padded due to __declspec(align()), which is
@@ -495,23 +495,23 @@
'conditions': [
['use_aura==0', {
'sources!': [
- 'base/view_prop.cc',
- 'base/view_prop.h',
+ 'view_prop.cc',
+ 'view_prop.h',
],
}],
],
'sources!': [
- 'base/dragdrop/drag_drop_types.h',
- 'base/dragdrop/os_exchange_data.cc',
+ 'dragdrop/drag_drop_types.h',
+ 'dragdrop/os_exchange_data.cc',
],
}],
['OS=="mac"', {
'dependencies': [
- '../third_party/mozilla/mozilla.gyp:mozilla',
+ '../../third_party/mozilla/mozilla.gyp:mozilla',
],
'sources!': [
- 'base/dragdrop/drag_utils.cc',
- 'base/dragdrop/drag_utils.h',
+ 'dragdrop/drag_utils.cc',
+ 'dragdrop/drag_utils.h',
],
'link_settings': {
'libraries': [
@@ -528,31 +528,31 @@
],
},
'dependencies': [
- '../build/linux/system.gyp:x11',
- '../build/linux/system.gyp:xcursor',
- '../build/linux/system.gyp:xext',
- '../build/linux/system.gyp:xfixes',
- '../build/linux/system.gyp:xrender', # For XRender* function calls in x11_util.cc.
+ '../../build/linux/system.gyp:x11',
+ '../../build/linux/system.gyp:xcursor',
+ '../../build/linux/system.gyp:xext',
+ '../../build/linux/system.gyp:xfixes',
+ '../../build/linux/system.gyp:xrender', # For XRender* function calls in x11_util.cc.
],
}],
['toolkit_views==0', {
'sources!': [
- 'base/dragdrop/drop_target_event.cc',
- 'base/dragdrop/drop_target_event.h',
+ 'dragdrop/drop_target_event.cc',
+ 'dragdrop/drop_target_event.h',
],
}],
['OS=="android"', {
'sources!': [
- 'base/default_theme_provider.cc',
- 'base/dragdrop/drag_utils.cc',
- 'base/dragdrop/drag_utils.h',
- 'base/l10n/l10n_font_util.cc',
- 'base/models/button_menu_item_model.cc',
- 'base/models/dialog_model.cc',
- 'base/theme_provider.cc',
- 'base/touch/touch_device.cc',
- 'base/touch/touch_editing_controller.cc',
- 'base/ui_base_types.cc',
+ 'default_theme_provider.cc',
+ 'dragdrop/drag_utils.cc',
+ 'dragdrop/drag_utils.h',
+ 'l10n/l10n_font_util.cc',
+ 'models/button_menu_item_model.cc',
+ 'models/dialog_model.cc',
+ 'theme_provider.cc',
+ 'touch/touch_device.cc',
+ 'touch/touch_editing_controller.cc',
+ 'ui_base_types.cc',
],
'dependencies': [
'ui_base_jni_headers',
@@ -565,22 +565,22 @@
}],
['OS=="android" and android_webview_build==0', {
'dependencies': [
- 'android/ui_android.gyp:ui_java',
+ '../android/ui_android.gyp:ui_java',
],
}],
['OS=="android" and use_aura==0', {
'sources!': [
- 'base/cursor/cursor_android.cc'
+ 'cursor/cursor_android.cc'
],
}],
['OS=="android" and use_aura==1', {
'sources!': [
- 'base/clipboard/clipboard_aura.cc'
+ 'clipboard/clipboard_aura.cc'
],
}],
['OS=="android" or OS=="ios"', {
'sources!': [
- 'base/device_form_factor_desktop.cc'
+ 'device_form_factor_desktop.cc'
],
}],
['OS=="linux"', {
@@ -613,18 +613,18 @@
'target_name': 'ui_base_jni_headers',
'type': 'none',
'sources': [
- 'android/java/src/org/chromium/ui/base/Clipboard.java',
- 'android/java/src/org/chromium/ui/base/LocalizationUtils.java',
- 'android/java/src/org/chromium/ui/base/SelectFileDialog.java',
- 'android/java/src/org/chromium/ui/base/TouchDevice.java',
- 'android/java/src/org/chromium/ui/base/ViewAndroid.java',
- 'android/java/src/org/chromium/ui/base/WindowAndroid.java',
+ '../android/java/src/org/chromium/ui/base/Clipboard.java',
+ '../android/java/src/org/chromium/ui/base/LocalizationUtils.java',
+ '../android/java/src/org/chromium/ui/base/SelectFileDialog.java',
+ '../android/java/src/org/chromium/ui/base/TouchDevice.java',
+ '../android/java/src/org/chromium/ui/base/ViewAndroid.java',
+ '../android/java/src/org/chromium/ui/base/WindowAndroid.java',
],
'variables': {
'jni_gen_package': 'ui',
'jni_generator_ptr_type': 'long',
},
- 'includes': [ '../build/jni_generator.gypi' ],
+ 'includes': [ '../../build/jni_generator.gypi' ],
},
],
}],
« no previous file with comments | « ui/aura/aura.gyp ('k') | ui/compositor/compositor.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698