Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(893)

Unified Diff: ui/views/views.gyp

Issue 11819008: Refactors building the system menu model into a common place (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to trunk and fix windows build Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome_browser_ui.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/views.gyp
diff --git a/ui/views/views.gyp b/ui/views/views.gyp
index 68791121095ffe5567f3f0d7a33b2ffd1d00c35b..a7c38b4c05b1c7a073ef73ca9a41f0df992dcdd8 100644
--- a/ui/views/views.gyp
+++ b/ui/views/views.gyp
@@ -448,9 +448,6 @@
],
'conditions': [
['use_aura==1', {
- 'sources/': [
- ['exclude', 'controls/menu/menu_2.*'],
- ],
'sources!': [
'controls/native_control.cc',
'controls/native_control.h',
@@ -476,12 +473,19 @@
}],
['OS=="win"', {
'sources/': [
+ ['include', 'controls/menu/native_menu_win.cc'],
+ ['include', 'controls/menu/native_menu_win.h'],
['include', 'widget/desktop_aura/desktop_screen_win.cc'],
['include', 'widget/desktop_aura/desktop_drag_drop_client_win.cc'],
['include', 'widget/desktop_aura/desktop_drop_target_win.cc'],
['include', 'widget/desktop_aura/desktop_root_window_host_win.cc'],
],
}],
+ ['OS!="win"', {
+ 'sources/': [
+ ['exclude', 'controls/menu/menu_2.*'],
+ ],
+ }],
],
}],
['use_aura==0', {
« no previous file with comments | « chrome/chrome_browser_ui.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698