Chromium Code Reviews| 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/callback.h" | 8 #include "base/callback.h" |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
| (...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 308 0, | 308 0, |
| 309 PrefServiceSyncable::UNSYNCABLE_PREF); | 309 PrefServiceSyncable::UNSYNCABLE_PREF); |
| 310 prefs->RegisterIntegerPref(prefs::kMediaCacheSize, | 310 prefs->RegisterIntegerPref(prefs::kMediaCacheSize, |
| 311 0, | 311 0, |
| 312 PrefServiceSyncable::UNSYNCABLE_PREF); | 312 PrefServiceSyncable::UNSYNCABLE_PREF); |
| 313 | 313 |
| 314 // Deprecated. Kept around for migration. | 314 // Deprecated. Kept around for migration. |
| 315 prefs->RegisterBooleanPref(prefs::kClearSiteDataOnExit, | 315 prefs->RegisterBooleanPref(prefs::kClearSiteDataOnExit, |
| 316 false, | 316 false, |
| 317 PrefServiceSyncable::SYNCABLE_PREF); | 317 PrefServiceSyncable::SYNCABLE_PREF); |
| 318 | |
| 319 prefs->RegisterListPref(prefs::kManagedModeWhitelist, | |
|
Bernhard Bauer
2013/01/07 12:34:19
Please don't lump new preferences into arbitrary p
Sergiu
2013/01/07 16:25:05
Got it, I was under the wrong impression that the
| |
| 320 PrefServiceSyncable::UNSYNCABLE_PREF); | |
| 321 prefs->RegisterListPref(prefs::kManagedModeBlacklist, | |
| 322 PrefServiceSyncable::UNSYNCABLE_PREF); | |
| 318 } | 323 } |
| 319 | 324 |
| 320 ProfileImpl::ProfileImpl( | 325 ProfileImpl::ProfileImpl( |
| 321 const FilePath& path, | 326 const FilePath& path, |
| 322 Delegate* delegate, | 327 Delegate* delegate, |
| 323 CreateMode create_mode, | 328 CreateMode create_mode, |
| 324 base::SequencedTaskRunner* sequenced_task_runner) | 329 base::SequencedTaskRunner* sequenced_task_runner) |
| 325 : path_(path), | 330 : path_(path), |
| 326 ALLOW_THIS_IN_INITIALIZER_LIST(io_data_(this)), | 331 ALLOW_THIS_IN_INITIALIZER_LIST(io_data_(this)), |
| 327 host_content_settings_map_(NULL), | 332 host_content_settings_map_(NULL), |
| (...skipping 811 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1139 if (!path.empty()) | 1144 if (!path.empty()) |
| 1140 *cache_path = path; | 1145 *cache_path = path; |
| 1141 *max_size = is_media_context ? prefs_->GetInteger(prefs::kMediaCacheSize) : | 1146 *max_size = is_media_context ? prefs_->GetInteger(prefs::kMediaCacheSize) : |
| 1142 prefs_->GetInteger(prefs::kDiskCacheSize); | 1147 prefs_->GetInteger(prefs::kDiskCacheSize); |
| 1143 } | 1148 } |
| 1144 | 1149 |
| 1145 base::Callback<ChromeURLDataManagerBackend*(void)> | 1150 base::Callback<ChromeURLDataManagerBackend*(void)> |
| 1146 ProfileImpl::GetChromeURLDataManagerBackendGetter() const { | 1151 ProfileImpl::GetChromeURLDataManagerBackendGetter() const { |
| 1147 return io_data_.GetChromeURLDataManagerBackendGetter(); | 1152 return io_data_.GetChromeURLDataManagerBackendGetter(); |
| 1148 } | 1153 } |
| OLD | NEW |