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

Unified Diff: ui/base/ui_base.gyp

Issue 851853002: It is time. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Trying to reup because the last upload failed. Created 5 years, 11 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/base/touch/touch_editing_controller.cc ('k') | ui/base/ui_base_exports.cc » ('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/base/ui_base.gyp b/ui/base/ui_base.gyp
index 46557122e43dc54b331a7e2fdb51f65946415df8..c4f94f03ce070edb0ab96d06ae503ddda8ed945a 100644
--- a/ui/base/ui_base.gyp
+++ b/ui/base/ui_base.gyp
@@ -56,8 +56,6 @@
'android/window_android.h',
'android/window_android_compositor.h',
'android/window_android_observer.h',
- 'base_window.cc',
- 'base_window.h',
'clipboard/clipboard.cc',
'clipboard/clipboard.h',
'clipboard/clipboard_android.cc',
@@ -133,26 +131,14 @@
'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_util.cc',
'cursor/cursor_util.h',
'cursor/cursor_win.cc',
'cursor/cursor_x11.cc',
- 'cursor/cursors_aura.cc',
- 'cursor/cursors_aura.h',
- 'cursor/image_cursors.cc',
- 'cursor/image_cursors.h',
- 'cursor/ozone/bitmap_cursor_factory_ozone.cc',
- 'cursor/ozone/bitmap_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_android.h',
'device_form_factor_desktop.cc',
@@ -296,8 +282,6 @@
'models/tree_model.h',
'models/tree_node_iterator.h',
'models/tree_node_model.h',
- 'nine_image_painter_factory.cc',
- 'nine_image_painter_factory.h',
'page_transition_types.cc',
'page_transition_types.h',
'page_transition_types_list.h',
@@ -316,16 +300,11 @@
'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_export.h',
@@ -443,11 +422,6 @@
'resource/resource_bundle_auralinux.cc',
],
}],
- ['use_ozone==1', {
- 'dependencies': [
- '../ozone/ozone.gyp:ozone_base',
- ],
- }],
['use_aura==1 and OS=="win"', {
'sources/': [
['exclude', 'dragdrop/drag_utils_aura.cc'],
@@ -472,8 +446,6 @@
'sources/': [
['include', '^dragdrop/os_exchange_data.cc'],
['include', '^dragdrop/os_exchange_data.h'],
- ['include', '^nine_image_painter_factory.cc'],
- ['include', '^nine_image_painter_factory.h'],
],
}],
],
@@ -553,8 +525,6 @@
'../../third_party/mozilla/mozilla.gyp:mozilla',
],
'sources!': [
- 'cursor/image_cursors.cc',
- 'cursor/image_cursors.h',
'dragdrop/drag_utils.cc',
'dragdrop/drag_utils.h',
],
@@ -581,30 +551,10 @@
'../events/platform/x11/x11_events_platform.gyp:x11_events_platform',
],
}],
- ['toolkit_views==0', {
- 'sources!': [
- 'dragdrop/drag_drop_types.h',
- 'dragdrop/drop_target_event.cc',
- 'dragdrop/drop_target_event.h',
- 'dragdrop/os_exchange_data.cc',
- 'dragdrop/os_exchange_data.h',
- 'nine_image_painter_factory.cc',
- 'nine_image_painter_factory.h',
- ],
- }],
['OS=="android"', {
'sources!': [
- 'cursor/image_cursors.cc',
- 'cursor/image_cursors.h',
- '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': [
@@ -672,19 +622,6 @@
'ime/input_method_imm32.h',
],
}],
- ['use_aura==0 or (desktop_linux==0 and use_ozone==0)', {
- 'sources!': [
- 'ime/input_method_auralinux.cc',
- 'ime/input_method_auralinux.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',
- ],
- }],
['use_x11==0', {
'sources!': [
'ime/composition_text_util_pango.cc',
« no previous file with comments | « ui/base/touch/touch_editing_controller.cc ('k') | ui/base/ui_base_exports.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698