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

Unified Diff: trunk/src/build/common.gypi

Issue 14631021: Revert 199625 "Remove ENABLE_MESSAGE_CENTER" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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 | « trunk/src/ash/test/ash_test_helper.cc ('k') | trunk/src/chrome/browser/about_flags.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/build/common.gypi
===================================================================
--- trunk/src/build/common.gypi (revision 199638)
+++ trunk/src/build/common.gypi (working copy)
@@ -155,6 +155,13 @@
'enable_app_list%': 0,
}],
+ # Enable Message Center only on ChromeOS, Windows, and Mac for now.
+ ['use_ash==1 or OS=="win" or OS=="mac"', {
+ 'enable_message_center%': 1,
+ }, {
+ 'enable_message_center%': 0,
+ }],
+
['use_aura==1 or (OS!="win" and OS!="mac" and OS!="ios" and OS!="android")', {
'use_default_render_theme%': 1,
}, {
@@ -187,6 +194,7 @@
'android_webview_build%': '<(android_webview_build)',
'google_tv%': '<(google_tv)',
'enable_app_list%': '<(enable_app_list)',
+ 'enable_message_center%': '<(enable_message_center)',
'use_default_render_theme%': '<(use_default_render_theme)',
'buildtype%': '<(buildtype)',
'branding%': '<(branding)',
@@ -795,6 +803,7 @@
'gyp_managed_install%': 0,
'google_tv%': '<(google_tv)',
'enable_app_list%': '<(enable_app_list)',
+ 'enable_message_center%': '<(enable_message_center)',
'use_default_render_theme%': '<(use_default_render_theme)',
'enable_settings_app%': '<(enable_settings_app)',
'use_official_google_api_keys%': '<(use_official_google_api_keys)',
@@ -2192,6 +2201,9 @@
['enable_app_list==1', {
'defines': ['ENABLE_APP_LIST=1'],
}],
+ ['enable_message_center==1', {
+ 'defines': ['ENABLE_MESSAGE_CENTER=1'],
+ }],
['enable_settings_app==1', {
'defines': ['ENABLE_SETTINGS_APP=1'],
}],
« no previous file with comments | « trunk/src/ash/test/ash_test_helper.cc ('k') | trunk/src/chrome/browser/about_flags.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698