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

Unified Diff: build/common.gypi

Issue 9949033: Removed access to prefs that does not work on Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix bad ifdef Created 8 years, 8 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 | chrome/browser/profiles/profile_impl.h » ('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 d56a3b5d02a6c87a6c0e00b7ec696a53d2127aa1..81b6c3fb19879c6629b6b742ddd717201cd66cf8 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -243,6 +243,9 @@
# Enable the task manager by default.
'enable_task_manager%': 1,
+
+ # Enables support for promo resource service.
+ 'enable_promo_resource_service%': 1,
# XInput2 multitouch support is disabled by default (use_xi2_mt=0).
# Setting to non-zero value enables XI2 MT. When XI2 MT is enabled,
@@ -510,6 +513,7 @@
'enable_session_service%': '<(enable_session_service)',
'enable_themes%': '<(enable_themes)',
'enable_background%': '<(enable_background)',
+ 'enable_promo_resource_service%': '<(enable_promo_resource_service)',
'linux_use_gold_binary%': '<(linux_use_gold_binary)',
'linux_use_gold_flags%': '<(linux_use_gold_flags)',
'use_canvas_skia%': '<(use_canvas_skia)',
@@ -798,8 +802,13 @@
'java_bridge%': 1,
# Android does not support themes.
'enable_themes%': 0,
+
+ # Android does not support background apps.
'enable_background%': 0,
+ # Android does not support promo resources service.
+ 'enable_promo_resource_service%': 0,
+
# Sessions are store separately in the Java side.
'enable_session_service%': 0,
@@ -1391,6 +1400,9 @@
['enable_background==1', {
'defines': ['ENABLE_BACKGROUND=1'],
}],
+ ['enable_promo_resource_service==1', {
+ 'defines': ['ENABLE_PROMO_RESOURCE_SERVICE=1'],
+ }],
['enable_automation==1', {
'defines': ['ENABLE_AUTOMATION=1'],
}],
« no previous file with comments | « no previous file | chrome/browser/profiles/profile_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698