diff options
| author | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-03 13:00:30 +0000 |
|---|---|---|
| committer | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-03 13:00:30 +0000 |
| commit | 9f3bfe33615723db70dd535d74ff78f3ed7f8cbf (patch) | |
| tree | 61a432ec834962a63595ae8f0114ca705e1333f8 /views/views.gyp | |
| parent | c4d45d1e5535ba2f268d2d05e54d3e523cb8d9d4 (diff) | |
| download | chromium_src-9f3bfe33615723db70dd535d74ff78f3ed7f8cbf.zip chromium_src-9f3bfe33615723db70dd535d74ff78f3ed7f8cbf.tar.gz chromium_src-9f3bfe33615723db70dd535d74ff78f3ed7f8cbf.tar.bz2 | |
views: Properly exclude native_menu_x when touchui==0 and toolkit_uses_gtk=1
BUG=None
TEST=gold doesn't complaint about multiple definitions for views::MenuWrapper::CreateWrapper when linking libviews.so
Review URL: http://codereview.chromium.org/7466054
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95233 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/views.gyp')
| -rw-r--r-- | views/views.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/views/views.gyp b/views/views.gyp index b6e79a6..f3e9192 100644 --- a/views/views.gyp +++ b/views/views.gyp @@ -402,8 +402,8 @@ }], ['touchui==0', { 'sources!': [ - 'native_menu_x.cc', - 'native_menu_x.h', + 'controls/menu/native_menu_x.cc', + 'controls/menu/native_menu_x.h', 'widget/tooltip_manager_views.cc', 'touchui/touch_selection_controller_impl.cc', 'touchui/touch_selection_controller_impl.h', |