chrome/browser/managed_mode_url_filter.cc - Issue 10834380: Fix android's experimental bot broken by: https://chromiumcodereview.appspot.com/10824257

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/managed_mode_url_filter.cc

Issue 10834380: Fix android's experimental bot broken by: https://chromiumcodereview.appspot.com/10824257 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

Download patch

Index: chrome/browser/managed_mode_url_filter.cc

diff --git a/chrome/browser/managed_mode_url_filter.cc b/chrome/browser/managed_mode_url_filter.cc

index ea819901d128f65b6a8d3596251ba31ed0379545..778af3d2f200c977962d657bcb460a573fdca674 100644

--- a/chrome/browser/managed_mode_url_filter.cc

+++ b/chrome/browser/managed_mode_url_filter.cc

@@ -70,8 +70,10 @@ bool ManagedModeURLFilter::IsURLWhitelisted(const GURL& url) const {

if (!active_)

return true;

+#if defined(ENABLE_CONFIGURATION_POLICY)

if (!policy::URLBlacklist::HasStandardScheme(url))

return true;

+#endif

std::set<URLMatcherConditionSet::ID> matching_ids =

url_matcher_->MatchURL(url);

« no previous file with comments | « no previous file | no next file » | no next file with comments »