diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-24 01:23:58 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-24 01:23:58 +0000 |
| commit | 380ab46417433097d6fc3a0c92236e46b4ea1d40 (patch) | |
| tree | ab0b6701270f8d2e9ea56927f4941df4217bf925 /chrome/browser/profile.cc | |
| parent | 4f991420767e0051e7f49019ab0e431c229a2345 (diff) | |
| download | chromium_src-380ab46417433097d6fc3a0c92236e46b4ea1d40.zip chromium_src-380ab46417433097d6fc3a0c92236e46b4ea1d40.tar.gz chromium_src-380ab46417433097d6fc3a0c92236e46b4ea1d40.tar.bz2 | |
Remove unused bits and pieces of #ifdefed code that isn't used.
Review URL: http://codereview.chromium.org/93042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14402 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profile.cc')
| -rw-r--r-- | chrome/browser/profile.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc index 44f8c17..a234ac5 100644 --- a/chrome/browser/profile.cc +++ b/chrome/browser/profile.cc @@ -347,9 +347,6 @@ class OffTheRecordProfileImpl : public Profile, ProfileImpl::ProfileImpl(const FilePath& path) : path_(path), off_the_record_(false), -#ifdef CHROME_PERSONALIZATION - personalization_(NULL), -#endif request_context_(NULL), media_request_context_(NULL), history_service_created_(false), @@ -367,6 +364,12 @@ ProfileImpl::ProfileImpl(const FilePath& path) PrefService* prefs = GetPrefs(); prefs->AddPrefObserver(prefs::kSpellCheckDictionary, this); prefs->AddPrefObserver(prefs::kEnableSpellCheck, this); + +#ifdef CHROME_PERSONALIZATION + if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableP13n)) + personalization_.reset(Personalization::CreateProfilePersonalization(this)); +#endif + #if defined(OS_LINUX) // TODO(port): Remove ifdef when the Linux splash page is not needed. prefs->transient()->SetString(prefs::kHomePage, "about:linux-splash"); @@ -900,10 +903,6 @@ void ProfileImpl::StopCreateSessionServiceTimer() { #ifdef CHROME_PERSONALIZATION ProfilePersonalization* ProfileImpl::GetProfilePersonalization() { - DCHECK(!Personalization::IsP13NDisabled()); - if (!personalization_.get()) - personalization_.reset( - Personalization::CreateProfilePersonalization(this)); return personalization_.get(); } #endif |