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

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: Removing default in switch. Created 8 years 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/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 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 PrefService::UNSYNCABLE_PREF); 315 PrefService::UNSYNCABLE_PREF);
316 prefs->RegisterIntegerPref(prefs::kMediaCacheSize, 316 prefs->RegisterIntegerPref(prefs::kMediaCacheSize,
317 0, 317 0,
318 PrefService::UNSYNCABLE_PREF); 318 PrefService::UNSYNCABLE_PREF);
319 319
320 // Deprecated. Kept around for migration. 320 // Deprecated. Kept around for migration.
321 prefs->RegisterBooleanPref(prefs::kClearSiteDataOnExit, 321 prefs->RegisterBooleanPref(prefs::kClearSiteDataOnExit,
322 false, 322 false,
323 PrefService::SYNCABLE_PREF); 323 PrefService::SYNCABLE_PREF);
324 324
325 // Preferences for whitelist and blacklists
326 prefs->RegisterListPref(prefs::kManagedModeWhitelist, 325 prefs->RegisterListPref(prefs::kManagedModeWhitelist,
327 new ListValue(), 326 new ListValue(),
328 PrefService::UNSYNCABLE_PREF); 327 PrefService::UNSYNCABLE_PREF);
329 prefs->RegisterListPref(prefs::kManagedModeBlacklist, 328 prefs->RegisterListPref(prefs::kManagedModeBlacklist,
330 new ListValue(), 329 new ListValue(),
331 PrefService::UNSYNCABLE_PREF); 330 PrefService::UNSYNCABLE_PREF);
332 } 331 }
333 332
334 ProfileImpl::ProfileImpl( 333 ProfileImpl::ProfileImpl(
335 const FilePath& path, 334 const FilePath& path,
(...skipping 829 matching lines...) Expand 10 before | Expand all | Expand 10 after
1165 if (!path.empty()) 1164 if (!path.empty())
1166 *cache_path = path; 1165 *cache_path = path;
1167 *max_size = is_media_context ? prefs_->GetInteger(prefs::kMediaCacheSize) : 1166 *max_size = is_media_context ? prefs_->GetInteger(prefs::kMediaCacheSize) :
1168 prefs_->GetInteger(prefs::kDiskCacheSize); 1167 prefs_->GetInteger(prefs::kDiskCacheSize);
1169 } 1168 }
1170 1169
1171 base::Callback<ChromeURLDataManagerBackend*(void)> 1170 base::Callback<ChromeURLDataManagerBackend*(void)>
1172 ProfileImpl::GetChromeURLDataManagerBackendGetter() const { 1171 ProfileImpl::GetChromeURLDataManagerBackendGetter() const {
1173 return io_data_.GetChromeURLDataManagerBackendGetter(); 1172 return io_data_.GetChromeURLDataManagerBackendGetter();
1174 } 1173 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698