summaryrefslogtreecommitdiffstats
path: root/views/views.gyp
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-25 21:44:29 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-25 21:44:29 +0000
commit50bde0387560560e711ca9ec376b0f7734ea5054 (patch)
treef86cbfebbb14d200672737f1d49895b3974b7546 /views/views.gyp
parent31fd99b24c73754eac6e6417ce76ada710166b69 (diff)
downloadchromium_src-50bde0387560560e711ca9ec376b0f7734ea5054.zip
chromium_src-50bde0387560560e711ca9ec376b0f7734ea5054.tar.gz
chromium_src-50bde0387560560e711ca9ec376b0f7734ea5054.tar.bz2
Revert 98306 - Create a new views_aura_desktop.
Get views::Widget rendering working against an aura::Window NativeWidget. http://crbug.com/93944 TEST=none Review URL: http://codereview.chromium.org/7741027 TBR=ben@chromium.org Review URL: http://codereview.chromium.org/7749020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98312 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/views.gyp')
-rw-r--r--views/views.gyp51
1 files changed, 0 insertions, 51 deletions
diff --git a/views/views.gyp b/views/views.gyp
index 759ee9a..8415705 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -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',
- ],
- }],
- ],
- },
],