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

Side by Side Diff: chrome/browser/prefs/browser_prefs.cc

Issue 13954011: Enable VariationsService on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/prefs/browser_prefs.h" 5 #include "chrome/browser/prefs/browser_prefs.h"
6 6
7 #include "apps/prefs.h" 7 #include "apps/prefs.h"
8 #include "base/prefs/pref_registry_simple.h" 8 #include "base/prefs/pref_registry_simple.h"
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "chrome/browser/about_flags.h" 10 #include "chrome/browser/about_flags.h"
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 MetricsService::RegisterPrefs(registry); 194 MetricsService::RegisterPrefs(registry);
195 PrefProxyConfigTrackerImpl::RegisterPrefs(registry); 195 PrefProxyConfigTrackerImpl::RegisterPrefs(registry);
196 ProfileInfoCache::RegisterPrefs(registry); 196 ProfileInfoCache::RegisterPrefs(registry);
197 ProfileManager::RegisterPrefs(registry); 197 ProfileManager::RegisterPrefs(registry);
198 PromoResourceService::RegisterPrefs(registry); 198 PromoResourceService::RegisterPrefs(registry);
199 RegisterPrefsForRecoveryComponent(registry); 199 RegisterPrefsForRecoveryComponent(registry);
200 SigninManagerFactory::RegisterPrefs(registry); 200 SigninManagerFactory::RegisterPrefs(registry);
201 SSLConfigServiceManager::RegisterPrefs(registry); 201 SSLConfigServiceManager::RegisterPrefs(registry);
202 UpgradeDetector::RegisterPrefs(registry); 202 UpgradeDetector::RegisterPrefs(registry);
203 WebCacheManager::RegisterPrefs(registry); 203 WebCacheManager::RegisterPrefs(registry);
204 chrome_variations::VariationsService::RegisterPrefs(registry);
204 205
205 #if defined(ENABLE_PLUGINS) 206 #if defined(ENABLE_PLUGINS)
206 PluginFinder::RegisterPrefs(registry); 207 PluginFinder::RegisterPrefs(registry);
207 #endif 208 #endif
208 209
209 #if defined(ENABLE_PLUGIN_INSTALLATION) 210 #if defined(ENABLE_PLUGIN_INSTALLATION)
210 PluginsResourceService::RegisterPrefs(registry); 211 PluginsResourceService::RegisterPrefs(registry);
211 #endif 212 #endif
212 213
213 #if defined(ENABLE_CONFIGURATION_POLICY) 214 #if defined(ENABLE_CONFIGURATION_POLICY)
214 policy::BrowserPolicyConnector::RegisterPrefs(registry); 215 policy::BrowserPolicyConnector::RegisterPrefs(registry);
215 policy::PolicyStatisticsCollector::RegisterPrefs(registry); 216 policy::PolicyStatisticsCollector::RegisterPrefs(registry);
216 #endif 217 #endif
217 218
218 #if defined(ENABLE_NOTIFICATIONS) 219 #if defined(ENABLE_NOTIFICATIONS)
219 NotificationPrefsManager::RegisterPrefs(registry); 220 NotificationPrefsManager::RegisterPrefs(registry);
220 #endif 221 #endif
221 222
222 #if defined(ENABLE_TASK_MANAGER) 223 #if defined(ENABLE_TASK_MANAGER)
223 TaskManager::RegisterPrefs(registry); 224 TaskManager::RegisterPrefs(registry);
224 #endif // defined(ENABLE_TASK_MANAGER) 225 #endif // defined(ENABLE_TASK_MANAGER)
225 226
226 #if defined(TOOLKIT_VIEWS) 227 #if defined(TOOLKIT_VIEWS)
227 RegisterBrowserViewPrefs(registry); 228 RegisterBrowserViewPrefs(registry);
228 RegisterTabStripLayoutTypePrefs(registry); 229 RegisterTabStripLayoutTypePrefs(registry);
229 #endif 230 #endif
230 231
231 #if !defined(OS_ANDROID) 232 #if !defined(OS_ANDROID)
232 BackgroundModeManager::RegisterPrefs(registry); 233 BackgroundModeManager::RegisterPrefs(registry);
233 chrome_variations::VariationsService::RegisterPrefs(registry);
234 RegisterBrowserPrefs(registry); 234 RegisterBrowserPrefs(registry);
235 RegisterDefaultBrowserPromptPrefs(registry); 235 RegisterDefaultBrowserPromptPrefs(registry);
236 ManagedMode::RegisterPrefs(registry); 236 ManagedMode::RegisterPrefs(registry);
237 #endif 237 #endif
238 238
239 #if defined(OS_CHROMEOS) 239 #if defined(OS_CHROMEOS)
240 chromeos::AudioHandler::RegisterPrefs(registry); 240 chromeos::AudioHandler::RegisterPrefs(registry);
241 chromeos::DataPromoNotification::RegisterPrefs(registry); 241 chromeos::DataPromoNotification::RegisterPrefs(registry);
242 chromeos::device_settings_cache::RegisterPrefs(registry); 242 chromeos::device_settings_cache::RegisterPrefs(registry);
243 chromeos::language_prefs::RegisterPrefs(registry); 243 chromeos::language_prefs::RegisterPrefs(registry);
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
440 } 440 }
441 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 441 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
442 442
443 current_version |= GOOGLE_URL_TRACKER_PREFS; 443 current_version |= GOOGLE_URL_TRACKER_PREFS;
444 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 444 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
445 current_version); 445 current_version);
446 } 446 }
447 } 447 }
448 448
449 } // namespace chrome 449 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698