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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/base/BUILD.gn

Issue 1276943002: Editing sources for iOS //ui/base. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@Editing_sources_for_net
Patch Set: Created 5 years, 4 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 | « BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/BUILD.gn
diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
index 573d72b649381d4a777417b76ac8bfaaf241ab61..48b55df3c646383844b490b82b80a45fae96706c 100644
--- a/ui/base/BUILD.gn
+++ b/ui/base/BUILD.gn
@@ -15,12 +15,6 @@ build_ime = !is_ios
component("base") {
output_name = "ui_base"
sources = [
- "accelerators/accelerator.cc",
- "accelerators/accelerator.h",
- "accelerators/accelerator_history.cc",
- "accelerators/accelerator_history.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",
@@ -28,13 +22,8 @@ component("base") {
"accelerators/platform_accelerator_cocoa.mm",
"android/ui_base_jni_registrar.cc",
"android/ui_base_jni_registrar.h",
- "base_window.cc",
- "base_window.h",
- "clipboard/clipboard.cc",
- "clipboard/clipboard.h",
"clipboard/clipboard_android.cc",
"clipboard/clipboard_android.h",
- "clipboard/clipboard_constants.cc",
"clipboard/clipboard_mac.h",
"clipboard/clipboard_mac.mm",
"clipboard/clipboard_types.h",
@@ -42,12 +31,8 @@ component("base") {
"clipboard/clipboard_util_win.h",
"clipboard/clipboard_win.cc",
"clipboard/clipboard_win.h",
- "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",
@@ -107,29 +92,17 @@ component("base") {
"cursor/cursor.h",
"cursor/cursor_android.cc",
"cursor/cursor_loader.h",
- "cursor/cursor_util.cc",
- "cursor/cursor_util.h",
"cursor/cursor_win.cc",
- "cursor/cursors_aura.cc",
- "cursor/cursors_aura.h",
- "cursor/image_cursors.cc",
- "cursor/image_cursors.h",
- "default_theme_provider.cc",
- "default_theme_provider.h",
"default_theme_provider_mac.mm",
"device_form_factor.h",
"device_form_factor_android.cc",
"device_form_factor_android.h",
"device_form_factor_desktop.cc",
"device_form_factor_ios.mm",
- "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_mac.mm",
"dragdrop/drag_utils_win.cc",
@@ -137,8 +110,6 @@ component("base") {
"dragdrop/drop_target_event.h",
"dragdrop/drop_target_win.cc",
"dragdrop/drop_target_win.h",
- "dragdrop/file_info.cc",
- "dragdrop/file_info.h",
"dragdrop/os_exchange_data.cc",
"dragdrop/os_exchange_data.h",
"dragdrop/os_exchange_data_provider_mac.h",
@@ -177,30 +148,12 @@ component("base") {
"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_combobox_model.cc",
- "models/simple_combobox_model.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",
@@ -224,17 +177,7 @@ component("base") {
"resource/resource_handle.h",
"template_expressions.cc",
"template_expressions.h",
- "text/bytes_formatting.cc",
- "text/bytes_formatting.h",
- "theme_provider.cc",
- "theme_provider.h",
- "touch/selection_bound.cc",
- "touch/selection_bound.h",
"touch/touch_device.h",
- "touch/touch_editing_controller.cc",
- "touch/touch_editing_controller.h",
- "touch/touch_enabled.cc",
- "touch/touch_enabled.h",
"ui_base_export.h",
"ui_base_exports.cc",
"ui_base_paths.cc",
@@ -245,9 +188,6 @@ component("base") {
"ui_base_switches_util.h",
"ui_base_types.cc",
"ui_base_types.h",
- "user_activity/user_activity_detector.cc",
- "user_activity/user_activity_detector.h",
- "user_activity/user_activity_observer.h",
"view_prop.cc",
"view_prop.h",
"webui/jstemplate_builder.cc",
@@ -287,6 +227,70 @@ component("base") {
"work_area_watcher_observer.h",
]
+ if (!is_ios) {
+ sources = [
Dirk Pranke 2015/08/06 17:40:12 this needs to be at least "sources += [" We shoul
+ "accelerators/accelerator.cc",
+ "accelerators/accelerator.h",
+ "accelerators/accelerator_history.cc",
+ "accelerators/accelerator_history.h",
+ "accelerators/accelerator_manager.cc",
+ "accelerators/accelerator_manager.h",
+ "base_window.cc",
+ "base_window.h",
+ "clipboard/clipboard.cc",
+ "clipboard/clipboard.h",
+ "clipboard/clipboard_constants.cc",
+ "clipboard/custom_data_helper.cc",
+ "clipboard/custom_data_helper.h",
+ "clipboard/scoped_clipboard_writer.cc",
+ "clipboard/scoped_clipboard_writer.h",
+ "cursor/cursor_util.cc",
+ "cursor/cursor_util.h",
+ "cursor/cursors_aura.cc",
+ "cursor/cursors_aura.h",
+ "cursor/image_cursors.cc",
+ "cursor/image_cursors.h",
+ "default_theme_provider.cc",
+ "default_theme_provider.h",
+ "dragdrop/cocoa_dnd_util.h",
+ "dragdrop/cocoa_dnd_util.mm",
+ "dragdrop/drag_utils.cc",
+ "dragdrop/drag_utils.h",
+ "dragdrop/file_info.cc",
+ "dragdrop/file_info.h",
+ "models/button_menu_item_model.cc",
+ "models/button_menu_item_model.h",
+ "models/combobox_model.cc",
+ "models/combobox_model.h",
+ "models/dialog_model.cc",
+ "models/dialog_model.h",
+ "models/list_selection_model.cc",
+ "models/list_selection_model.h",
+ "models/menu_model.cc",
+ "models/menu_model.h",
+ "models/simple_combobox_model.cc",
+ "models/simple_combobox_model.h",
+ "models/simple_menu_model.cc",
+ "models/simple_menu_model.h",
+ "models/table_model.cc",
+ "models/table_model.h",
+ "models/tree_model.cc",
+ "models/tree_model.h",
+ "text/bytes_formatting.cc",
+ "text/bytes_formatting.h",
+ "theme_provider.cc",
+ "theme_provider.h",
+ "touch/selection_bound.cc",
+ "touch/selection_bound.h",
+ "touch/touch_editing_controller.cc",
+ "touch/touch_editing_controller.h",
+ "touch/touch_enabled.cc",
+ "touch/touch_enabled.h",
+ "user_activity/user_activity_detector.cc",
+ "user_activity/user_activity_detector.h",
+ ]
+ }
+
if (is_win) {
sources += [ "touch/touch_device_win.cc" ]
} else if (is_android) {
@@ -326,13 +330,6 @@ component("base") {
"//url",
]
- if (is_ios) {
- sources += [
- "l10n/l10n_util_mac.h",
- "l10n/l10n_util_mac.mm",
- ]
- }
-
if (toolkit_views) {
deps += [ "//ui/events" ]
}
@@ -567,10 +564,12 @@ component("base") {
source_set("test_support") {
testonly = true
sources = [
+ "test/ios/keyboard_appearance_listener.h",
+ "test/ios/keyboard_appearance_listener.mm",
+ "test/ios/ui_view_test_utils.h",
+ "test/ios/ui_view_test_utils.mm",
"test/material_design_controller_test_api.cc",
"test/material_design_controller_test_api.h",
- "test/nswindow_fullscreen_notification_waiter.h",
- "test/nswindow_fullscreen_notification_waiter.mm",
"test/scoped_fake_nswindow_fullscreen.h",
"test/scoped_fake_nswindow_fullscreen.mm",
"test/test_clipboard.cc",
@@ -581,9 +580,15 @@ source_set("test_support") {
"test/ui_controls_internal_win.h",
"test/ui_controls_mac.mm",
"test/ui_controls_win.cc",
- "test/windowed_nsnotification_observer.h",
- "test/windowed_nsnotification_observer.mm",
]
+ if (!is_ios) {
+ sources += [
+ "test/nswindow_fullscreen_notification_waiter.h",
+ "test/nswindow_fullscreen_notification_waiter.mm",
+ "test/windowed_nsnotification_observer.h",
+ "test/windowed_nsnotification_observer.mm",
+ ]
+ }
public_deps = [
":base",
@@ -654,6 +659,7 @@ test("ui_base_unittests") {
"resource/material_design/material_design_controller_unittest.cc",
"resource/resource_bundle_unittest.cc",
"template_expressions_unittest.cc",
+ "test/data/resource.h",
"test/run_all_unittests.cc",
"test/scoped_fake_nswindow_fullscreen_unittest.mm",
"test/test_clipboard_unittest.cc",
@@ -666,11 +672,16 @@ test("ui_base_unittests") {
if (is_android) {
sources -= [ "user_activity/user_activity_detector_unittest.cc" ]
}
+ sources += [ "test/data/resource.h" ]
if (is_ios) {
- # Compile this Mac file on iOS as well.
+ # Compile these Mac files on iOS as well.
set_sources_assignment_filter([])
- sources += [ "l10n/l10n_util_mac_unittest.mm" ]
+ sources += [
+ "l10n/l10n_util_mac.h",
+ "l10n/l10n_util_mac.mm",
+ "l10n/l10n_util_mac_unittest.mm",
+ ]
set_sources_assignment_filter(sources_assignment_filter)
} else { # !is_ios
sources += [
@@ -695,7 +706,6 @@ test("ui_base_unittests") {
"models/list_model_unittest.cc",
"models/list_selection_model_unittest.cc",
"models/tree_node_model_unittest.cc",
- "test/data/resource.h",
"text/bytes_formatting_unittest.cc",
"touch/selection_bound_unittest.cc",
"webui/web_ui_util_unittest.cc",
« no previous file with comments | « BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698