| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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/profiles/profile_impl.h" | 5 #include "chrome/browser/profiles/profile_impl.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
| 10 #include "base/environment.h" | 10 #include "base/environment.h" |
| (...skipping 622 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 633 void ProfileImpl::OnPrefsLoaded(bool success) { | 633 void ProfileImpl::OnPrefsLoaded(bool success) { |
| 634 if (!success) { | 634 if (!success) { |
| 635 if (delegate_) | 635 if (delegate_) |
| 636 delegate_->OnProfileCreated(this, false, false); | 636 delegate_->OnProfileCreated(this, false, false); |
| 637 return; | 637 return; |
| 638 } | 638 } |
| 639 | 639 |
| 640 // The Profile class and ProfileManager class may read some prefs so | 640 // The Profile class and ProfileManager class may read some prefs so |
| 641 // register known prefs as soon as possible. | 641 // register known prefs as soon as possible. |
| 642 Profile::RegisterUserPrefs(prefs_.get()); | 642 Profile::RegisterUserPrefs(prefs_.get()); |
| 643 browser::RegisterUserPrefs(prefs_.get()); | 643 chrome::RegisterUserPrefs(prefs_.get()); |
| 644 // TODO(mirandac): remove migration code after 6 months (crbug.com/69995). | 644 // TODO(mirandac): remove migration code after 6 months (crbug.com/69995). |
| 645 if (g_browser_process->local_state()) | 645 if (g_browser_process->local_state()) |
| 646 browser::MigrateBrowserPrefs(this, g_browser_process->local_state()); | 646 chrome::MigrateBrowserPrefs(this, g_browser_process->local_state()); |
| 647 | 647 |
| 648 // The last session exited cleanly if there is no pref for | 648 // The last session exited cleanly if there is no pref for |
| 649 // kSessionExitedCleanly or the value for kSessionExitedCleanly is true. | 649 // kSessionExitedCleanly or the value for kSessionExitedCleanly is true. |
| 650 last_session_exited_cleanly_ = | 650 last_session_exited_cleanly_ = |
| 651 prefs_->GetBoolean(prefs::kSessionExitedCleanly); | 651 prefs_->GetBoolean(prefs::kSessionExitedCleanly); |
| 652 // Mark the session as open. | 652 // Mark the session as open. |
| 653 prefs_->SetBoolean(prefs::kSessionExitedCleanly, false); | 653 prefs_->SetBoolean(prefs::kSessionExitedCleanly, false); |
| 654 | 654 |
| 655 ProfileDependencyManager::GetInstance()->CreateProfileServices(this, false); | 655 ProfileDependencyManager::GetInstance()->CreateProfileServices(this, false); |
| 656 | 656 |
| (...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1105 if (!path.empty()) | 1105 if (!path.empty()) |
| 1106 *cache_path = path; | 1106 *cache_path = path; |
| 1107 *max_size = is_media_context ? prefs_->GetInteger(prefs::kMediaCacheSize) : | 1107 *max_size = is_media_context ? prefs_->GetInteger(prefs::kMediaCacheSize) : |
| 1108 prefs_->GetInteger(prefs::kDiskCacheSize); | 1108 prefs_->GetInteger(prefs::kDiskCacheSize); |
| 1109 } | 1109 } |
| 1110 | 1110 |
| 1111 base::Callback<ChromeURLDataManagerBackend*(void)> | 1111 base::Callback<ChromeURLDataManagerBackend*(void)> |
| 1112 ProfileImpl::GetChromeURLDataManagerBackendGetter() const { | 1112 ProfileImpl::GetChromeURLDataManagerBackendGetter() const { |
| 1113 return io_data_.GetChromeURLDataManagerBackendGetter(); | 1113 return io_data_.GetChromeURLDataManagerBackendGetter(); |
| 1114 } | 1114 } |
| OLD | NEW |