| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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/profile.h" | 5 #include "chrome/browser/profile.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/file_path.h" | 8 #include "base/file_path.h" |
| 9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
| 10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
| (...skipping 500 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 511 | 511 |
| 512 extension_process_manager_.reset(new ExtensionProcessManager(this)); | 512 extension_process_manager_.reset(new ExtensionProcessManager(this)); |
| 513 extension_message_service_ = new ExtensionMessageService(this); | 513 extension_message_service_ = new ExtensionMessageService(this); |
| 514 | 514 |
| 515 PrefService* prefs = GetPrefs(); | 515 PrefService* prefs = GetPrefs(); |
| 516 prefs->AddPrefObserver(prefs::kSpellCheckDictionary, this); | 516 prefs->AddPrefObserver(prefs::kSpellCheckDictionary, this); |
| 517 prefs->AddPrefObserver(prefs::kEnableSpellCheck, this); | 517 prefs->AddPrefObserver(prefs::kEnableSpellCheck, this); |
| 518 prefs->AddPrefObserver(prefs::kEnableAutoSpellCorrect, this); | 518 prefs->AddPrefObserver(prefs::kEnableAutoSpellCorrect, this); |
| 519 | 519 |
| 520 #ifdef CHROME_PERSONALIZATION | 520 #ifdef CHROME_PERSONALIZATION |
| 521 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableP13n)) | 521 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableSync)) |
| 522 personalization_.reset(Personalization::CreateProfilePersonalization(this)); | 522 personalization_.reset(Personalization::CreateProfilePersonalization(this)); |
| 523 #endif | 523 #endif |
| 524 | 524 |
| 525 if (CommandLine::ForCurrentProcess()-> | 525 if (CommandLine::ForCurrentProcess()-> |
| 526 HasSwitch(switches::kPrivacyBlacklist)) { | 526 HasSwitch(switches::kPrivacyBlacklist)) { |
| 527 std::wstring option = CommandLine::ForCurrentProcess()->GetSwitchValue( | 527 std::wstring option = CommandLine::ForCurrentProcess()->GetSwitchValue( |
| 528 switches::kPrivacyBlacklist); | 528 switches::kPrivacyBlacklist); |
| 529 #if defined(OS_POSIX) | 529 #if defined(OS_POSIX) |
| 530 FilePath path(WideToUTF8(option)); | 530 FilePath path(WideToUTF8(option)); |
| 531 #else | 531 #else |
| (...skipping 679 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1211 | 1211 |
| 1212 void ProfileImpl::StopCreateSessionServiceTimer() { | 1212 void ProfileImpl::StopCreateSessionServiceTimer() { |
| 1213 create_session_service_timer_.Stop(); | 1213 create_session_service_timer_.Stop(); |
| 1214 } | 1214 } |
| 1215 | 1215 |
| 1216 #ifdef CHROME_PERSONALIZATION | 1216 #ifdef CHROME_PERSONALIZATION |
| 1217 ProfilePersonalization* ProfileImpl::GetProfilePersonalization() { | 1217 ProfilePersonalization* ProfileImpl::GetProfilePersonalization() { |
| 1218 return personalization_.get(); | 1218 return personalization_.get(); |
| 1219 } | 1219 } |
| 1220 #endif | 1220 #endif |
| OLD | NEW |