chrome/browser/policy/url_blacklist_manager.cc - Issue 18199003: Allow Chrome OS login profile to have different default pref values

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Comment addressed. 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

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/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 Loading...
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

OLD	NEW

« no previous file with comments | « chrome/browser/policy/url_blacklist_manager.h ('k') | chrome/browser/prefs/browser_prefs.h » ('j') | chrome/browser/sync/sync_prefs.cc » ('J')