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

Unified Diff: build/common.gypi

Issue 8713006: Revert "Reland "Move a bunch of ChromeOS APIs out of chrome/browser/extensions.""" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | « no previous file | chrome/browser/chromeos/extensions/file_browser_event_router.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 43f90aefbc3a4871693218808cd139085c6609f3..b3a4936471fa7c497eef35c4505b36e944416d4b 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -308,13 +308,18 @@
'enable_flapper_hacks%': 0,
}],
- # Enable file manager extension on Chrome OS.
- ['chromeos==1', {
+ # Enable file manager extension on Chrome OS or Aura.
+ ['chromeos==1 or use_aura==1', {
'file_manager_extension%': 1,
}, {
'file_manager_extension%': 0,
}],
+ # ... except on Windows even with Aura.
+ ['use_aura==1 and OS=="win"', {
+ 'file_manager_extension%': 0,
+ }],
+
# Enable WebUI TaskManager always on Chrome OS or Aura.
['chromeos==1 or use_aura==1', {
'webui_task_manager%': 1,
« no previous file with comments | « no previous file | chrome/browser/chromeos/extensions/file_browser_event_router.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698