diff options
author | jscholler@chromium.org <jscholler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-12 16:14:31 +0000 |
---|---|---|
committer | jscholler@chromium.org <jscholler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-12 16:14:31 +0000 |
commit | 5824201bb57df84df3abf2bfc1f1ce8d2cf0c3f4 (patch) | |
tree | e03a701c828ecddac721eb6f135de13a94e33ffa /build | |
parent | 69c3bd72bd91b15cde6db102f70ab6955642a19d (diff) | |
download | chromium_src-5824201bb57df84df3abf2bfc1f1ce8d2cf0c3f4.zip chromium_src-5824201bb57df84df3abf2bfc1f1ce8d2cf0c3f4.tar.gz chromium_src-5824201bb57df84df3abf2bfc1f1ce8d2cf0c3f4.tar.bz2 |
Removed access to prefs that does not work on Android
This work is useful to make sure at build time that we are not accessing prefs that are not registered.
This CL addresses the prefs registered by:
BrowserInit::RegisterUserPrefs
PinnedTabCodec::RegisterUserPrefs
PluginsUI::RegisterUserPrefs
PromoResourceService::RegisterUserPrefs
Later CL:
Browser::RegisterUserPrefs
SyncPromoUI::RegisterUserPrefs
*::RegisterPrefs
BUG=120802
TEST=Compiled and made diff-ed the link error to make sure they are the same.
Review URL: http://codereview.chromium.org/9949033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131994 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r-- | build/common.gypi | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi index 1c17edd..0d4011d 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -248,6 +248,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, @@ -519,6 +522,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)', @@ -812,8 +816,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, @@ -1408,6 +1417,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'], }], |