chrome/browser/policy/url_blacklist_policy_handler.cc - Issue 110643005: Refactored the URLBlacklistManager to avoid chrome/ and content/ dependencies.

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

Unified Diff: chrome/browser/policy/url_blacklist_policy_handler.cc

Issue 110643005: Refactored the URLBlacklistManager to avoid chrome/ and content/ dependencies. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/policy/url_blacklist_manager_unittest.cc ('k') | chrome/browser/policy/url_blacklist_policy_handler_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/policy/url_blacklist_policy_handler.cc

diff --git a/chrome/browser/policy/url_blacklist_policy_handler.cc b/chrome/browser/policy/url_blacklist_policy_handler.cc

index f7433e63936ac7a338bf0866aa3e86ada4f08aa5..5bc2385caa3ac2e73e7582c3e622dcaaf3ecd3cb 100644

--- a/chrome/browser/policy/url_blacklist_policy_handler.cc

+++ b/chrome/browser/policy/url_blacklist_policy_handler.cc

@@ -7,9 +7,9 @@

#include "base/memory/scoped_ptr.h"

#include "base/prefs/pref_value_map.h"

#include "base/values.h"

-#include "chrome/common/pref_names.h"

#include "components/policy/core/browser/policy_error_map.h"

#include "components/policy/core/common/policy_map.h"

+#include "components/policy/core/common/policy_pref_names.h"

#include "grit/component_strings.h"

#include "policy/policy_constants.h"

@@ -76,8 +76,10 @@ void URLBlacklistPolicyHandler::ApplyPolicySettings(const PolicyMap& policies,

}

- if (disabled_schemes || url_blacklist)

- prefs->SetValue(prefs::kUrlBlacklist, merged_url_blacklist.release());

+ if (disabled_schemes || url_blacklist) {

+ prefs->SetValue(policy_prefs::kUrlBlacklist,

+ merged_url_blacklist.release());

+ }

}

} // namespace policy