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

Unified Diff: ui/views/views.gyp

Issue 1477253002: Use a single views::MenuConfig instance for each platform (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add menu_config_android Created 5 years 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 | « ui/views/controls/menu/submenu_view.cc ('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 4400ab24f7e06ffefc8c390e2c85898426f446b4..3630e9d47bd71b1b6b323e109e818b5db708749e 100644
--- a/ui/views/views.gyp
+++ b/ui/views/views.gyp
@@ -101,6 +101,8 @@
'controls/menu/display_change_listener_mac.cc',
'controls/menu/menu_config.cc',
'controls/menu/menu_config.h',
+ 'controls/menu/menu_config_chromeos.cc',
+ 'controls/menu/menu_config_linux.cc',
'controls/menu/menu_config_mac.mm',
'controls/menu/menu_config_win.cc',
'controls/menu/menu_controller.cc',
@@ -372,7 +374,6 @@
'bubble/tray_bubble_view.cc',
'bubble/tray_bubble_view.h',
'controls/menu/display_change_listener_aura.cc',
- 'controls/menu/menu_config_aura.cc',
'controls/menu/menu_event_dispatcher.cc',
'controls/menu/menu_event_dispatcher.h',
'controls/menu/menu_key_event_handler.cc',
@@ -410,6 +411,7 @@
'widget/window_reorderer.h',
],
'views_android_sources': [
+ 'controls/menu/menu_config_android.cc',
'widget/android/android_focus_rules.cc',
'widget/android/android_focus_rules.h',
'widget/android/native_widget_android.cc',
@@ -499,10 +501,10 @@
'test/focus_manager_test.h',
'test/menu_runner_test_api.cc',
'test/menu_runner_test_api.h',
- 'test/slider_test_api.cc',
- 'test/slider_test_api.h',
'test/scoped_views_test_helper.cc',
'test/scoped_views_test_helper.h',
+ 'test/slider_test_api.cc',
+ 'test/slider_test_api.h',
'test/test_views.cc',
'test/test_views.h',
'test/test_views_delegate.h',
@@ -693,6 +695,9 @@
'sources/': [
['exclude', 'linux_ui'],
],
+ 'sources!': [
+ 'controls/menu/menu_config_linux.cc',
+ ],
}],
['OS=="win"', {
'sources': [
« no previous file with comments | « ui/views/controls/menu/submenu_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698