diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 00:42:06 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 00:42:06 +0000 |
| commit | e3c3eae6043ae1c69b9a21c9584abcf467604aa1 (patch) | |
| tree | fb061f48e0fb4200d0a9cfd8ceeb47e24d3db884 /views/views.gyp | |
| parent | eaf6dd563c1057e8adb4ec20d0d85e2c07cb5f13 (diff) | |
| download | chromium_src-e3c3eae6043ae1c69b9a21c9584abcf467604aa1.zip chromium_src-e3c3eae6043ae1c69b9a21c9584abcf467604aa1.tar.gz chromium_src-e3c3eae6043ae1c69b9a21c9584abcf467604aa1.tar.bz2 | |
Get views_unittests to compile (but not run).
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7824021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99278 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/views.gyp')
| -rw-r--r-- | views/views.gyp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/views/views.gyp b/views/views.gyp index 46dde6b..ce20a1a 100644 --- a/views/views.gyp +++ b/views/views.gyp @@ -296,6 +296,7 @@ 'layout/layout_manager.h', 'metrics.cc', 'metrics.h', + 'metrics_aura.cc', 'metrics_gtk.cc', 'metrics_wayland.cc', 'metrics_win.cc', @@ -418,6 +419,8 @@ ], 'sources!': [ 'controls/native_control.cc', + 'controls/tabbed_pane/tabbed_pane.cc', + 'controls/combobox/combobox.cc', 'widget/aero_tooltip_manager.cc', 'widget/child_window_message_processor.cc', 'widget/child_window_message_processor.h', @@ -507,6 +510,7 @@ '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', '../ui/base/strings/ui_strings.gyp:ui_strings', + '../ui/ui.gyp:gfx_resources', '../ui/ui.gyp:ui', '../ui/ui.gyp:ui_resources', '../ui/ui.gyp:ui_resources_standard', @@ -540,12 +544,14 @@ 'touchui/touch_selection_controller_impl_unittest.cc', 'view_unittest.cc', 'widget/native_widget_test_utils.h', + 'widget/native_widget_test_utils_aura.cc', 'widget/native_widget_test_utils_gtk.cc', 'widget/native_widget_test_utils_win.cc', 'widget/native_widget_unittest.cc', 'widget/native_widget_win_unittest.cc', 'widget/widget_unittest.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', ], @@ -598,6 +604,15 @@ ['exclude', 'ime/character_composer_unittest.cc'], ], }], + [ 'use_aura==1', { + 'sources/': [ + ['exclude', 'focus/focus_manager_unittest.cc'], # TODO(beng): + ['exclude', 'widget/native_widget_win_unittest.cc'], + ['exclude', 'controls/combobox/native_combobox_views_unittest.cc'], + ['exclude', 'controls/table/table_view_unittest.cc'], + ['exclude', 'controls/tabbed_pane/tabbed_pane_unittest.cc'], + ], + }], ], }, { |