Index: ui/base/BUILD.gn |
diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn |
index 94ccf3145f1979b65d5d5105b08a7d6bde485b73..da8df1d8d910b3ff4b84be75c02a9bb2a608e6dd 100644 |
--- a/ui/base/BUILD.gn |
+++ b/ui/base/BUILD.gn |
@@ -82,6 +82,8 @@ component("base") { |
"cocoa/nib_loading.mm", |
"cocoa/nsgraphics_context_additions.h", |
"cocoa/nsgraphics_context_additions.mm", |
+ "cocoa/remote_layer_api.h", |
+ "cocoa/remote_layer_api.mm", |
"cocoa/tracking_area.h", |
"cocoa/tracking_area.mm", |
"cocoa/underlay_opengl_hosting_window.h", |
@@ -94,13 +96,13 @@ component("base") { |
"cursor/cursor.h", |
"cursor/cursor_android.cc", |
"cursor/cursor_loader.h", |
- "cursor/cursor_loader_win.cc", |
- "cursor/cursor_loader_win.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", |
@@ -112,13 +114,13 @@ component("base") { |
"dragdrop/cocoa_dnd_util.h", |
"dragdrop/cocoa_dnd_util.mm", |
"dragdrop/drag_drop_types.h", |
- "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", |
"dragdrop/drop_target_event.cc", |
"dragdrop/drop_target_event.h", |
@@ -128,9 +130,74 @@ component("base") { |
"dragdrop/file_info.h", |
"dragdrop/os_exchange_data.cc", |
"dragdrop/os_exchange_data.h", |
+ "dragdrop/os_exchange_data_provider_mac.h", |
+ "dragdrop/os_exchange_data_provider_mac.mm", |
"dragdrop/os_exchange_data_provider_win.cc", |
"dragdrop/os_exchange_data_provider_win.h", |
"hit_test.h", |
+ "ime/candidate_window.cc", |
+ "ime/candidate_window.h", |
+ "ime/chromeos/character_composer.cc", |
+ "ime/chromeos/character_composer.h", |
+ "ime/chromeos/ime_bridge.cc", |
+ "ime/chromeos/ime_bridge.h", |
+ "ime/chromeos/ime_keymap.cc", |
+ "ime/chromeos/ime_keymap.h", |
+ "ime/chromeos/mock_ime_candidate_window_handler.cc", |
+ "ime/chromeos/mock_ime_candidate_window_handler.h", |
+ "ime/chromeos/mock_ime_engine_handler.cc", |
+ "ime/chromeos/mock_ime_engine_handler.h", |
+ "ime/chromeos/mock_ime_input_context_handler.cc", |
+ "ime/chromeos/mock_ime_input_context_handler.h", |
+ "ime/composition_text.cc", |
+ "ime/composition_text.h", |
+ "ime/composition_text_util_pango.cc", |
+ "ime/composition_text_util_pango.h", |
+ "ime/composition_underline.h", |
+ "ime/dummy_input_method_delegate.cc", |
+ "ime/dummy_input_method_delegate.h", |
+ "ime/infolist_entry.cc", |
+ "ime/infolist_entry.h", |
+ "ime/input_method.h", |
+ "ime/input_method_auralinux.cc", |
+ "ime/input_method_auralinux.h", |
+ "ime/input_method_base.cc", |
+ "ime/input_method_base.h", |
+ "ime/input_method_chromeos.cc", |
+ "ime/input_method_chromeos.h", |
+ "ime/input_method_delegate.h", |
+ "ime/input_method_factory.cc", |
+ "ime/input_method_factory.h", |
+ "ime/input_method_initializer.cc", |
+ "ime/input_method_initializer.h", |
+ "ime/input_method_mac.h", |
+ "ime/input_method_mac.mm", |
+ "ime/input_method_minimal.cc", |
+ "ime/input_method_minimal.h", |
+ "ime/input_method_observer.h", |
+ "ime/input_method_win.cc", |
+ "ime/input_method_win.h", |
+ "ime/linux/fake_input_method_context.cc", |
+ "ime/linux/fake_input_method_context.h", |
+ "ime/linux/fake_input_method_context_factory.cc", |
+ "ime/linux/fake_input_method_context_factory.h", |
+ "ime/linux/linux_input_method_context.h", |
+ "ime/linux/linux_input_method_context_factory.cc", |
+ "ime/linux/linux_input_method_context_factory.h", |
+ "ime/mock_input_method.cc", |
+ "ime/mock_input_method.h", |
+ "ime/remote_input_method_delegate_win.h", |
+ "ime/remote_input_method_win.cc", |
+ "ime/remote_input_method_win.h", |
+ "ime/text_input_client.cc", |
+ "ime/text_input_client.h", |
+ "ime/text_input_focus_manager.cc", |
+ "ime/text_input_focus_manager.h", |
+ "ime/text_input_type.h", |
+ "ime/win/imm32_manager.cc", |
+ "ime/win/imm32_manager.h", |
+ "ime/win/tsf_input_scope.cc", |
+ "ime/win/tsf_input_scope.h", |
"l10n/formatter.cc", |
"l10n/formatter.h", |
"l10n/l10n_font_util.cc", |
@@ -167,6 +234,8 @@ component("base") { |
"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", |
@@ -200,6 +269,7 @@ component("base") { |
"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", |
"ui_base_paths.h", |
@@ -360,6 +430,11 @@ component("base") { |
configs += [ |
"//build/config/linux:pangocairo", |
] |
+ } else { |
+ sources -= [ |
+ "ime/composition_text_util_pango.cc", |
+ "ime/composition_text_util_pango.h", |
+ ] |
} |
if (is_chromeos || (use_aura && is_linux && !use_x11)) { |
@@ -371,6 +446,10 @@ component("base") { |
libs = [] |
if (is_win) { |
+ sources += [ |
+ "cursor/cursor_loader_win.cc", |
+ "cursor/cursor_loader_win.h", |
+ ] |
deps += [ |
"//third_party/wtl", |
] |
@@ -447,6 +526,15 @@ component("base") { |
} |
} |
} |
+ if (use_ozone) { |
+ sources += [ |
+ "cursor/cursor_loader_ozone.cc", |
+ "cursor/cursor_loader_ozone.h", |
+ "cursor/cursor_ozone.cc", |
+ "cursor/ozone/bitmap_cursor_factory_ozone.cc", |
+ "cursor/ozone/bitmap_cursor_factory_ozone.h", |
+ ] |
+ } |
if (!toolkit_views) { |
sources -= [ |