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

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

Issue 480513004: Stopping the history recording for a supervised user (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge master after style changes. Created 6 years, 4 months 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
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 <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after
347 true, 347 true,
348 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 348 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
349 registry->RegisterBooleanPref( 349 registry->RegisterBooleanPref(
350 prefs::kSigninAllowed, 350 prefs::kSigninAllowed,
351 true, 351 true,
352 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 352 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
353 registry->RegisterBooleanPref( 353 registry->RegisterBooleanPref(
354 prefs::kForceSafeSearch, 354 prefs::kForceSafeSearch,
355 false, 355 false,
356 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 356 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
357 registry->RegisterBooleanPref(
358 prefs::kRecordHistory,
359 false,
360 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
357 registry->RegisterIntegerPref( 361 registry->RegisterIntegerPref(
358 prefs::kProfileAvatarIndex, 362 prefs::kProfileAvatarIndex,
359 -1, 363 -1,
360 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 364 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
361 // Whether a profile is using an avatar without having explicitely chosen it 365 // Whether a profile is using an avatar without having explicitely chosen it
362 // (i.e. was assigned by default by legacy profile creation). 366 // (i.e. was assigned by default by legacy profile creation).
363 registry->RegisterBooleanPref( 367 registry->RegisterBooleanPref(
364 prefs::kProfileUsingDefaultAvatar, 368 prefs::kProfileUsingDefaultAvatar,
365 true, 369 true,
366 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 370 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
(...skipping 1090 matching lines...) Expand 10 before | Expand all | Expand 10 after
1457 ProfileImpl::CreateDomainReliabilityMonitor() { 1461 ProfileImpl::CreateDomainReliabilityMonitor() {
1458 domain_reliability::DomainReliabilityService* service = 1462 domain_reliability::DomainReliabilityService* service =
1459 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> 1463 domain_reliability::DomainReliabilityServiceFactory::GetInstance()->
1460 GetForBrowserContext(this); 1464 GetForBrowserContext(this);
1461 if (!service) 1465 if (!service)
1462 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>(); 1466 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>();
1463 1467
1464 return service->CreateMonitor( 1468 return service->CreateMonitor(
1465 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); 1469 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
1466 } 1470 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698