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

Unified Diff: views/views.gyp

Issue 7749020: Revert 98306 - Create a new views_aura_desktop. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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 | « views/view_aura.cc ('k') | views/widget/native_widget_aura.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/views.gyp
===================================================================
--- views/views.gyp (revision 98311)
+++ views/views.gyp (working copy)
@@ -242,7 +242,6 @@
'events/event_utils_win.h',
'events/event_x.cc',
'focus/accelerator_handler.h',
- 'focus/accelerator_handler_aura.cc',
'focus/accelerator_handler_gtk.cc',
'focus/accelerator_handler_touch.cc',
'focus/accelerator_handler_win.cc',
@@ -311,7 +310,6 @@
'touchui/touch_selection_controller_impl.h',
'view.cc',
'view.h',
- 'view_aura.cc',
'view_constants.cc',
'view_constants.h',
'view_gtk.cc',
@@ -398,16 +396,6 @@
'widget/child_window_message_processor.cc',
'widget/child_window_message_processor.h',
],
- 'conditions': [
- ['OS=="win"', {
- 'sources/': [
- ['include', 'controls/menu/menu_config_win.cc'],
- ['include', 'controls/menu/menu_item_view_win.cc'],
- ['include', 'controls/menu/menu_separator_win.cc'],
- ['include', 'drag_utils_win.cc'],
- ],
- }],
- ],
}],
['toolkit_uses_gtk == 1', {
'dependencies': [
@@ -778,45 +766,6 @@
}],
],
},
- {
- 'target_name': 'views_aura_desktop',
- 'type': 'executable',
- 'dependencies': [
- '../base/base.gyp:base',
- '../base/base.gyp:base_i18n',
- '../skia/skia.gyp:skia',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
- '../ui/ui.gyp:gfx_resources',
- '../ui/ui.gyp:ui',
- '../ui/ui.gyp:ui_resources',
- '../ui/ui.gyp:ui_resources_standard',
- 'views',
- 'views_desktop_lib',
- ],
- 'include_dirs': [
- '..',
- ],
- 'sources': [
- 'aura_desktop/aura_desktop_main.cc',
- '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
- '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
- '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc',
- ],
- 'conditions': [
- ['OS=="win"', {
- 'link_settings': {
- 'libraries': [
- '-limm32.lib',
- '-loleacc.lib',
- ]
- },
- 'include_dirs': [
- '<(DEPTH)/third_party/wtl/include',
- ],
- }],
- ],
- },
],
« no previous file with comments | « views/view_aura.cc ('k') | views/widget/native_widget_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698