summaryrefslogtreecommitdiffstats
path: root/chrome/browser/prefs
diff options
context:
space:
mode:
authorasvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-06 18:04:29 +0000
committerasvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-06 18:04:29 +0000
commit0481124f832fc841b19b0b82bc42e7617f3da8b6 (patch)
tree0f7771b297dfc1d8e0ac1bfde58f0354b563572c /chrome/browser/prefs
parenta7b8020aa91b73aca2e1d06b65569e4892712ebd (diff)
downloadchromium_src-0481124f832fc841b19b0b82bc42e7617f3da8b6.zip
chromium_src-0481124f832fc841b19b0b82bc42e7617f3da8b6.tar.gz
chromium_src-0481124f832fc841b19b0b82bc42e7617f3da8b6.tar.bz2
Put VariationsService into the chrome_variations namespace.
Also, rename chrome_variations::ID to chrome_variations::VariationID, since there are other things in that namespace now (which was already the case with the protobuf classes). BUG=none TEST=compiles Review URL: https://chromiumcodereview.appspot.com/10693106 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145608 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs')
-rw-r--r--chrome/browser/prefs/browser_prefs.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index db1be73..2a851c1 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -125,7 +125,7 @@ void RegisterLocalState(PrefService* local_state) {
ProfileManager::RegisterPrefs(local_state);
SigninManagerFactory::RegisterPrefs(local_state);
SSLConfigServiceManager::RegisterPrefs(local_state);
- VariationsService::RegisterPrefs(local_state);
+ chrome_variations::VariationsService::RegisterPrefs(local_state);
WebCacheManager::RegisterPrefs(local_state);
#if defined(ENABLE_CONFIGURATION_POLICY)