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

Unified Diff: chrome/chrome_browser.gypi

Issue 8509027: Add status area to Aura builds. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move status area view ids back to chromeos 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/aura/status_area_host_aura.cc ('k') | chrome/common/chrome_switches.h » ('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 a8da647a953cdfd13fef201bbbbf4a0773ac5caf..e565df2b59ec593de8cba0251bd30af17dee1f40 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3260,6 +3260,8 @@
'browser/ui/views/aura/chrome_shell_delegate.h',
'browser/ui/views/aura/launcher_icon_updater.cc',
'browser/ui/views/aura/launcher_icon_updater.h',
+ 'browser/ui/views/aura/status_area_host_aura.cc',
+ 'browser/ui/views/aura/status_area_host_aura.h',
'browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc',
'browser/ui/views/autocomplete/autocomplete_popup_contents_view.h',
'browser/ui/views/autocomplete/autocomplete_result_view.cc',
@@ -4143,6 +4145,26 @@
['exclude', '^browser/chromeos/input_method/candidate_window.h'],
],
}],
+ # For now, always include status area code for aura builds, even
+ # though the code is under browser/chromeos.
+ # TODO: (stevenjb/beng): Find a home for these.
+ ['use_aura==1', {
+ 'sources/': [
+ ['include', '^browser/chromeos/status/clock_menu_button.cc'],
+ ['include', '^browser/chromeos/status/clock_menu_button.h'],
+ ['include', '^browser/chromeos/status/status_area_button.cc'],
+ ['include', '^browser/chromeos/status/status_area_button.h'],
+ ['include', '^browser/chromeos/status/status_area_view.cc'],
+ ['include', '^browser/chromeos/status/status_area_view.h'],
+ ],
+ }],
+ # linux/chromeos only status area button.
+ ['OS=="linux" and use_aura==1', {
+ 'sources/': [
+ ['include', '^browser/chromeos/status/memory_menu_button.cc'],
+ ['include', '^browser/chromeos/status/memory_menu_button.h'],
+ ],
+ }],
['use_aura==1', {
'sources/': [
['exclude', '^browser/aeropeek_manager.cc'],
« no previous file with comments | « chrome/browser/ui/views/aura/status_area_host_aura.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698