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

Side by Side Diff: chrome/browser/policy/url_blacklist_manager.cc

Issue 18199003: Allow Chrome OS login profile to have different default pref values (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. Created 7 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/policy/url_blacklist_manager.h ('k') | chrome/browser/prefs/browser_prefs.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/policy/url_blacklist_manager.h" 5 #include "chrome/browser/policy/url_blacklist_manager.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 384
385 #if !defined(OS_CHROMEOS) 385 #if !defined(OS_CHROMEOS)
386 if (IsSigninFlowURL(request.url())) 386 if (IsSigninFlowURL(request.url()))
387 return false; 387 return false;
388 #endif 388 #endif
389 389
390 return IsURLBlocked(request.url()); 390 return IsURLBlocked(request.url());
391 } 391 }
392 392
393 // static 393 // static
394 void URLBlacklistManager::RegisterUserPrefs( 394 void URLBlacklistManager::RegisterProfilePrefs(
395 user_prefs::PrefRegistrySyncable* registry) { 395 user_prefs::PrefRegistrySyncable* registry) {
396 registry->RegisterListPref(prefs::kUrlBlacklist, 396 registry->RegisterListPref(prefs::kUrlBlacklist,
397 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 397 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
398 registry->RegisterListPref(prefs::kUrlWhitelist, 398 registry->RegisterListPref(prefs::kUrlWhitelist,
399 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 399 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
400 } 400 }
401 401
402 } // namespace policy 402 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/policy/url_blacklist_manager.h ('k') | chrome/browser/prefs/browser_prefs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698