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

Unified Diff: build/common.gypi

Issue 15955003: Menu for the OSX app launcher. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: split Created 7 years, 7 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
« no previous file with comments | « no previous file | ui/app_list/app_list.gyp » ('j') | ui/app_list/cocoa/app_list_menu_cocoa.h » ('J')
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 5516c63fb77467ce06a27fb98cbce8b1f70b2b7c..c288392cfdbbdf692c3c999e17725a748a503628 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -618,8 +618,8 @@
'use_system_libjpeg%': '<(android_webview_build)',
}],
- # Enable Settings App only on Windows.
- ['enable_app_list==1 and OS=="win"', {
+ # Do not enable the Settings App on ChromeOS.
+ ['enable_app_list==1 and chromeos==0', {
'enable_settings_app%': 1,
}, {
'enable_settings_app%': 0,
« no previous file with comments | « no previous file | ui/app_list/app_list.gyp » ('j') | ui/app_list/cocoa/app_list_menu_cocoa.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698