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

Unified Diff: build/common.gypi

Issue 11784034: Skeleton for app_list on OSX, and refactoring for enable_app_list=1 on OS=="mac". (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase for 175876 and 175961 Created 7 years, 11 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 | « ash/wm/app_list_controller.cc ('k') | chrome/browser/ui/app_list/app_list_controller_browsertest.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 77beb3f09121a82cc827c8d589a712c9733b03bc..ab366bd35113e4e6eb2765896ba0351198d9d9ad 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -135,13 +135,17 @@
'enable_touch_ui%': 1,
}],
- # Enable App Launcher & Message Center only on ChromeOS and Windows
- # for now.
- ['use_ash==1 or OS=="win"', {
+ # Enable App Launcher only on ChromeOS, Windows and OSX.
+ ['use_ash==1 or OS=="win" or OS=="mac"', {
'enable_app_list%': 1,
- 'enable_message_center%': 1,
}, {
'enable_app_list%': 0,
+ }],
+
+ # Enable Message Center only on ChromeOS and Windows for now.
+ ['use_ash==1 or OS=="win"', {
+ 'enable_message_center%': 1,
+ }, {
'enable_message_center%': 0,
}],
« no previous file with comments | « ash/wm/app_list_controller.cc ('k') | chrome/browser/ui/app_list/app_list_controller_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698