"accelerators/platform_accelerator.h",
"accelerators/platform_accelerator_cocoa.h",
"accelerators/platform_accelerator_cocoa.mm",
+ "android/system_ui_resource_manager.h",
"android/ui_base_jni_registrar.cc",
"android/ui_base_jni_registrar.h",
"android/view_android.cc",
"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",
"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",
"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",
"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",
"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",
"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",
"win/internal_constants.h",
"win/lock_state.cc",
"win/lock_state.h",
+ "win/open_file_name_win.cc",
+ "win/open_file_name_win.h",
"win/message_box_win.cc",
"win/message_box_win.h",
"win/mouse_wheel_util.cc",
"window_open_disposition.cc",
"window_open_disposition.h",
"work_area_watcher_observer.h",
+ "x/x11_foreign_window_manager.cc",
+ "x/x11_foreign_window_manager.h",
"x/x11_menu_list.cc",
"x/x11_menu_list.h",
"x/x11_util.cc",
"//net",
"//skia",
"//third_party/icu",
+ "//ui/events/platform",
+ "//ui/events:events_base",
"//ui/resources",
- "//ui/resources:unscaled_resources",
"//ui/strings",
- "//ui/webui/resources",
"//url",
]
"l10n/l10n_util_mac.h",
"l10n/l10n_util_mac.mm",
]
+ } else {
+ deps += [ "//ui/base/ime" ]
}
if (toolkit_views) {
}
if (!use_x11) {
sources -= [
+ "x/x11_foreign_window_manager.cc",
+ "x/x11_foreign_window_manager.h",
+ "x/x11_menu_list.cc",
+ "x/x11_menu_list.h",
"x/x11_util.cc",
"x/x11_util.h",
"x/x11_util_internal.h",
}
}
- if (use_pango) {
- configs += [
- "//build/config/linux:pangocairo",
- ]
- }
-
if (is_chromeos || (use_aura && is_linux && !use_x11)) {
sources += [
"dragdrop/os_exchange_data_provider_aura.cc",
libs = []
if (is_win) {
+ sources += [
+ "cursor/cursor_loader_win.cc",
+ "cursor/cursor_loader_win.h",
+ ]
deps += [
"//third_party/wtl",
]
]
sources -= [
+ "cursor/image_cursors.cc",
+ "cursor/image_cursors.h",
"dragdrop/drag_utils.cc",
"dragdrop/drag_utils.h",
]
libs += [
"Accelerate.framework",
"AudioUnit.framework",
- "CoreView.framework",
+ "CoreVideo.framework",
]
}
}
}
}
+ 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",
+ ]
+
+ deps += [
+ "//ui/ozone:ozone_base",
+ ]
+ }
if (!toolkit_views) {
sources -= [
}
}
-source_set("ui_base_test_support") {
+source_set("test_support") {
sources = [
"test/ui_controls.h",
"test/ui_controls_aura.cc",
"../android/java/src/org/chromium/ui/base/Clipboard.java",
"../android/java/src/org/chromium/ui/base/DeviceFormFactor.java",
"../android/java/src/org/chromium/ui/base/LocalizationUtils.java",
+ "../android/java/src/org/chromium/ui/base/ResourceBundle.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",