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

Unified Diff: chrome/chrome_browser.gypi

Issue 8476003: Implement the status tray/icon API for ChromeOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixing gyp problems in the bots that led to reverting. Created 9 years, 1 month 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/browser/ui/views/status_icons/status_tray_chromeos_browsertest.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index a339925a185a4d84492319655dfa1133900abeac..3d95ddbd718b2fa6473f179db576cc230bc60ec2 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3537,8 +3537,12 @@
'browser/ui/views/ssl_client_certificate_selector.h',
'browser/ui/views/status_bubble_views.cc',
'browser/ui/views/status_bubble_views.h',
+ 'browser/ui/views/status_icons/status_icon_chromeos.cc',
+ 'browser/ui/views/status_icons/status_icon_chromeos.h',
'browser/ui/views/status_icons/status_icon_win.cc',
'browser/ui/views/status_icons/status_icon_win.h',
+ 'browser/ui/views/status_icons/status_tray_chromeos.cc',
+ 'browser/ui/views/status_icons/status_tray_chromeos.h',
'browser/ui/views/status_icons/status_tray_linux.cc',
'browser/ui/views/status_icons/status_tray_win.cc',
'browser/ui/views/status_icons/status_tray_win.h',
@@ -4062,6 +4066,10 @@
['exclude', 'browser/renderer_host/offline_resource_handler.cc'],
['exclude', 'browser/renderer_host/offline_resource_handler.h'],
['exclude', 'browser/ui/toolbar/wrench_menu_model_chromeos.cc'],
+ ['exclude', 'browser/ui/views/status_icons/status_tray_chromeos.cc'],
+ ['exclude', 'browser/ui/views/status_icons/status_tray_chromeos.h'],
+ ['exclude', 'browser/ui/views/status_icons/status_icon_chromeos.cc'],
+ ['exclude', 'browser/ui/views/status_icons/status_icon_chromeos.h'],
['exclude', 'browser/ui/webui/active_downloads_ui.cc'],
['exclude', 'browser/ui/webui/fileicon_source_chromeos.cc'],
['exclude', 'browser/ui/webui/fileicon_source_chromeos.h'],
@@ -4992,6 +5000,16 @@
['exclude', '^browser/extensions/extension_input_ui_api.h'],
],
}],
+ # Include the chromeos status tray/icon only for non-aura builds.
+ ['OS=="linux" and toolkit_views==1 and chromeos==1 and use_aura==0', {
+ 'sources/': [
+ ['include', '^browser/ui/views/status_icons/status_icon_chromeos.cc'],
+ ['include', '^browser/ui/views/status_icons/status_icon_chromeos.h'],
+ ['include', '^browser/ui/views/status_icons/status_tray_chromeos.cc'],
+ ['include', '^browser/ui/views/status_icons/status_tray_chromeos.h'],
+ ['exclude', '^browser/ui/views/status_icons/status_tray_linux.cc'],
+ ],
+ }],
# Exclude file manager files again
# (Required because of the '^browser/extensions/' include above)
['file_manager_extension==0', {
« no previous file with comments | « chrome/browser/ui/views/status_icons/status_tray_chromeos_browsertest.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698