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

Unified Diff: chrome/chrome_browser_ui.gypi

Issue 22455002: linux_aura: Implement the static part of the dbus menu for Unity. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: The gyp fix Created 7 years, 4 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
Index: chrome/chrome_browser_ui.gypi
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index 87285acd65f0f19f722fea025bde993a813f1a80..a17e00da22a4985330fe58443d5ed3fa0da8a965 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -1705,6 +1705,10 @@
'browser/ui/views/frame/browser_desktop_root_window_host_x11.h',
'browser/ui/views/frame/glass_browser_frame_view.cc',
'browser/ui/views/frame/glass_browser_frame_view.h',
+ 'browser/ui/views/frame/global_menu_bar_x11.cc',
+ 'browser/ui/views/frame/global_menu_bar_x11.h',
+ 'browser/ui/views/frame/global_menu_bar_registrar_x11.cc',
+ 'browser/ui/views/frame/global_menu_bar_registrar_x11.h',
'browser/ui/views/frame/immersive_mode_controller.cc',
'browser/ui/views/frame/immersive_mode_controller.h',
'browser/ui/views/frame/immersive_mode_controller_ash.cc',
@@ -2574,12 +2578,16 @@
['exclude', 'browser/ui/ash/chrome_shell_delegate_views.cc'],
['exclude', 'browser/ui/ash/session_state_delegate_views.cc'],
['exclude', 'browser/ui/screen_capture_notification_ui_stub.cc'],
+ ['exclude', 'browser/ui/views/frame/browser_desktop_root_window_host_x11.cc'],
+ ['exclude', 'browser/ui/views/frame/browser_desktop_root_window_host_x11.h'],
['exclude', 'browser/ui/views/frame/desktop_browser_frame_aura.cc'],
['exclude', 'browser/ui/views/frame/desktop_browser_frame_aura.h'],
['exclude', 'browser/ui/views/frame/desktop_user_action_handler_aura.cc'],
['exclude', 'browser/ui/views/frame/desktop_user_action_handler_aura.h'],
- ['exclude', 'browser/ui/views/frame/browser_desktop_root_window_host_x11.cc'],
- ['exclude', 'browser/ui/views/frame/browser_desktop_root_window_host_x11.h'],
+ ['exclude', 'browser/ui/views/frame/global_menu_bar_x11.cc'],
+ ['exclude', 'browser/ui/views/frame/global_menu_bar_x11.h'],
+ ['exclude', 'browser/ui/views/frame/global_menu_bar_registrar_x11.cc'],
+ ['exclude', 'browser/ui/views/frame/global_menu_bar_registrar_x11.h'],
['exclude', 'browser/ui/views/screen_capture_notification_ui_views.cc'],
['exclude', 'browser/ui/webui/help/version_updater_basic.cc'],
['exclude', 'browser/ui/webui/help/version_updater_basic.h'],
@@ -2627,6 +2635,7 @@
# world.
'browser/ui/libgtk2ui/libgtk2ui.gyp:gtk2ui',
'../ui/linux_ui/linux_ui.gyp:linux_ui',
+ '../build/linux/system.gyp:gio',
],
}],
['use_aura==0 or chromeos==1 or OS!="linux"', {

Powered by Google App Engine
This is Rietveld 408576698