diff options
| author | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-01 21:21:11 +0000 |
|---|---|---|
| committer | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-01 21:21:11 +0000 |
| commit | 4a229e90405f2c1d97409343f2c274f384284353 (patch) | |
| tree | e98220c0de513a06c72207ca12dadcd3689f641c /views/views.gyp | |
| parent | 084262c6432c7f673f8342326e144660b40cb7d7 (diff) | |
| download | chromium_src-4a229e90405f2c1d97409343f2c274f384284353.zip chromium_src-4a229e90405f2c1d97409343f2c274f384284353.tar.gz chromium_src-4a229e90405f2c1d97409343f2c274f384284353.tar.bz2 | |
Reland change for aura tooltips that was revert due to build break:
http://codereview.chromium.org/8747022
BUG=97249
TEST=none
Review URL: http://codereview.chromium.org/8769011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112535 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/views.gyp')
| -rw-r--r-- | views/views.gyp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/views/views.gyp b/views/views.gyp index 3a47930..140822e 100644 --- a/views/views.gyp +++ b/views/views.gyp @@ -343,10 +343,10 @@ '../ui/views/widget/gtk_views_window.h', '../ui/views/widget/root_view.cc', '../ui/views/widget/root_view.h', + '../ui/views/widget/tooltip_manager_aura.cc', + '../ui/views/widget/tooltip_manager_aura.h', '../ui/views/widget/tooltip_manager_gtk.cc', '../ui/views/widget/tooltip_manager_gtk.h', - '../ui/views/widget/tooltip_manager_views.cc', - '../ui/views/widget/tooltip_manager_views.h', '../ui/views/widget/tooltip_manager_win.cc', '../ui/views/widget/tooltip_manager_win.h', '../ui/views/widget/tooltip_manager.cc', @@ -531,6 +531,8 @@ '../ui/views/focus/focus_traversal_unittest.cc', '../ui/views/layout/box_layout_unittest.cc', '../ui/views/layout/grid_layout_unittest.cc', + '../ui/views/test/test_tooltip_client.cc', + '../ui/views/test/test_tooltip_client.h', '../ui/views/test/test_views_delegate.cc', '../ui/views/test/test_views_delegate.h', '../ui/views/test/views_test_base.cc', @@ -587,6 +589,7 @@ 'sources/': [ ['exclude', '../ui/aura/test/test_desktop_delegate.cc'], ['exclude', '../ui/aura/test/test_desktop_delegate.h'], + ['exclude', '../ui/views/test/test_tooltip_client.cc'], ], }], ], |