Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(640)

Side by Side Diff: chrome/browser/profiles/profile_impl.cc

Issue 11299035: Support manual (white|black)list, previewing and allowing after interstitial (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 0, 276 0,
277 PrefService::UNSYNCABLE_PREF); 277 PrefService::UNSYNCABLE_PREF);
278 prefs->RegisterIntegerPref(prefs::kMediaCacheSize, 278 prefs->RegisterIntegerPref(prefs::kMediaCacheSize,
279 0, 279 0,
280 PrefService::UNSYNCABLE_PREF); 280 PrefService::UNSYNCABLE_PREF);
281 281
282 // Deprecated. Kept around for migration. 282 // Deprecated. Kept around for migration.
283 prefs->RegisterBooleanPref(prefs::kClearSiteDataOnExit, 283 prefs->RegisterBooleanPref(prefs::kClearSiteDataOnExit,
284 false, 284 false,
285 PrefService::SYNCABLE_PREF); 285 PrefService::SYNCABLE_PREF);
286
287 // Preferences for whitelist and blacklists
Bernhard Bauer 2012/11/16 15:04:46 We usually explain what preferences are for in pre
Sergiu 2012/11/26 14:48:08 Removed and rephrased in pref_names.cc.
288 prefs->RegisterListPref(prefs::kManagedModeWhitelist,
289 new ListValue(),
290 PrefService::UNSYNCABLE_PREF);
291 prefs->RegisterListPref(prefs::kManagedModeBlacklist,
292 new ListValue(),
293 PrefService::UNSYNCABLE_PREF);
286 } 294 }
287 295
288 ProfileImpl::ProfileImpl(const FilePath& path, 296 ProfileImpl::ProfileImpl(const FilePath& path,
289 Delegate* delegate, 297 Delegate* delegate,
290 CreateMode create_mode) 298 CreateMode create_mode)
291 : path_(path), 299 : path_(path),
292 ALLOW_THIS_IN_INITIALIZER_LIST(io_data_(this)), 300 ALLOW_THIS_IN_INITIALIZER_LIST(io_data_(this)),
293 host_content_settings_map_(NULL), 301 host_content_settings_map_(NULL),
294 last_session_exit_type_(EXIT_NORMAL), 302 last_session_exit_type_(EXIT_NORMAL),
295 start_time_(Time::Now()), 303 start_time_(Time::Now()),
(...skipping 858 matching lines...) Expand 10 before | Expand all | Expand 10 after
1154 if (!path.empty()) 1162 if (!path.empty())
1155 *cache_path = path; 1163 *cache_path = path;
1156 *max_size = is_media_context ? prefs_->GetInteger(prefs::kMediaCacheSize) : 1164 *max_size = is_media_context ? prefs_->GetInteger(prefs::kMediaCacheSize) :
1157 prefs_->GetInteger(prefs::kDiskCacheSize); 1165 prefs_->GetInteger(prefs::kDiskCacheSize);
1158 } 1166 }
1159 1167
1160 base::Callback<ChromeURLDataManagerBackend*(void)> 1168 base::Callback<ChromeURLDataManagerBackend*(void)>
1161 ProfileImpl::GetChromeURLDataManagerBackendGetter() const { 1169 ProfileImpl::GetChromeURLDataManagerBackendGetter() const {
1162 return io_data_.GetChromeURLDataManagerBackendGetter(); 1170 return io_data_.GetChromeURLDataManagerBackendGetter();
1163 } 1171 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698