| 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 282 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 293 prefs_.reset(PrefService::CreatePrefService( | 293 prefs_.reset(PrefService::CreatePrefService( |
| 294 GetPrefFilePath(), | 294 GetPrefFilePath(), |
| 295 policy_service_.get(), | 295 policy_service_.get(), |
| 296 new ExtensionPrefStore( | 296 new ExtensionPrefStore( |
| 297 ExtensionPrefValueMapFactory::GetForProfile(this), false), | 297 ExtensionPrefValueMapFactory::GetForProfile(this), false), |
| 298 false)); | 298 false)); |
| 299 OnPrefsLoaded(true); | 299 OnPrefsLoaded(true); |
| 300 } else { | 300 } else { |
| 301 NOTREACHED(); | 301 NOTREACHED(); |
| 302 } | 302 } |
| 303 |
| 304 if (command_line->HasSwitch(switches::kEnableRestoreSessionState)) |
| 305 SetSaveSessionStorageOnDisk(true); |
| 303 } | 306 } |
| 304 | 307 |
| 305 void ProfileImpl::DoFinalInit(bool is_new_profile) { | 308 void ProfileImpl::DoFinalInit(bool is_new_profile) { |
| 306 PrefService* prefs = GetPrefs(); | 309 PrefService* prefs = GetPrefs(); |
| 307 pref_change_registrar_.Init(prefs); | 310 pref_change_registrar_.Init(prefs); |
| 308 pref_change_registrar_.Add(prefs::kGoogleServicesUsername, this); | 311 pref_change_registrar_.Add(prefs::kGoogleServicesUsername, this); |
| 309 pref_change_registrar_.Add(prefs::kDefaultZoomLevel, this); | 312 pref_change_registrar_.Add(prefs::kDefaultZoomLevel, this); |
| 310 pref_change_registrar_.Add(prefs::kProfileAvatarIndex, this); | 313 pref_change_registrar_.Add(prefs::kProfileAvatarIndex, this); |
| 311 pref_change_registrar_.Add(prefs::kProfileName, this); | 314 pref_change_registrar_.Add(prefs::kProfileName, this); |
| 312 | 315 |
| (...skipping 792 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1105 if (!path.empty()) | 1108 if (!path.empty()) |
| 1106 *cache_path = path; | 1109 *cache_path = path; |
| 1107 *max_size = is_media_context ? prefs_->GetInteger(prefs::kMediaCacheSize) : | 1110 *max_size = is_media_context ? prefs_->GetInteger(prefs::kMediaCacheSize) : |
| 1108 prefs_->GetInteger(prefs::kDiskCacheSize); | 1111 prefs_->GetInteger(prefs::kDiskCacheSize); |
| 1109 } | 1112 } |
| 1110 | 1113 |
| 1111 base::Callback<ChromeURLDataManagerBackend*(void)> | 1114 base::Callback<ChromeURLDataManagerBackend*(void)> |
| 1112 ProfileImpl::GetChromeURLDataManagerBackendGetter() const { | 1115 ProfileImpl::GetChromeURLDataManagerBackendGetter() const { |
| 1113 return io_data_.GetChromeURLDataManagerBackendGetter(); | 1116 return io_data_.GetChromeURLDataManagerBackendGetter(); |
| 1114 } | 1117 } |
| OLD | NEW |