summaryrefslogtreecommitdiffstats
path: root/views/views.gyp
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-22 21:37:54 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-22 21:37:54 +0000
commit47dfc956f274408cb60666181d846f057c827ba9 (patch)
tree18bcbecece29723f310a21b14cc6dc5cc40a024e /views/views.gyp
parentace7ca0c74a46611c404e399fc35cee45ba840e4 (diff)
downloadchromium_src-47dfc956f274408cb60666181d846f057c827ba9.zip
chromium_src-47dfc956f274408cb60666181d846f057c827ba9.tar.gz
chromium_src-47dfc956f274408cb60666181d846f057c827ba9.tar.bz2
Enable FocusManager tests for Aura.
- Now building the file! - Disable some tests that only work on Windows. - Remove some dead Gtk code. http://crbug.com/102572 TEST=unittests Review URL: http://codereview.chromium.org/8642002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111220 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/views.gyp')
-rw-r--r--views/views.gyp5
1 files changed, 4 insertions, 1 deletions
diff --git a/views/views.gyp b/views/views.gyp
index 2759c4d..51b21db 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -526,7 +526,11 @@
'../ui/views/bubble/bubble_frame_view_unittest.cc',
'../ui/views/events/event_unittest.cc',
'../ui/views/focus/accelerator_handler_gtk_unittest.cc',
+ '../ui/views/focus/focus_manager_test.h',
+ '../ui/views/focus/focus_manager_test.cc',
'../ui/views/focus/focus_manager_unittest.cc',
+ '../ui/views/focus/focus_manager_unittest_win.cc',
+ '../ui/views/focus/focus_traversal_unittest.cc',
'../ui/views/layout/box_layout_unittest.cc',
'../ui/views/layout/grid_layout_unittest.cc',
'../ui/views/touchui/touch_selection_controller_impl_unittest.cc',
@@ -600,7 +604,6 @@
'../ui/aura/aura.gyp:test_support_aura',
],
'sources/': [
- ['exclude', '../ui/views/focus/focus_manager_unittest.cc'], # TODO(beng):
['exclude', 'controls/combobox/native_combobox_views_unittest.cc'],
['exclude', 'controls/table/table_view_unittest.cc'],
['exclude', 'controls/tabbed_pane/tabbed_pane_unittest.cc'],