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

Unified Diff: chrome/browser/managed_mode_url_filter.cc

Issue 10827411: Disable uses of URLBlacklist on platforms that don't support it. (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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 778af3d2f200c977962d657bcb460a573fdca674..26a8578394b8ae6d3759541923b09633816ad4c1 100644
--- a/chrome/browser/managed_mode_url_filter.cc
+++ b/chrome/browser/managed_mode_url_filter.cc
@@ -25,6 +25,7 @@ scoped_ptr<URLMatcher> CreateWhitelistOnBlockingPoolThread(
scoped_ptr<URLMatcher> url_matcher(new URLMatcher());
URLMatcherConditionSet::Vector all_conditions;
+#if defined(ENABLE_CONFIGURATION_POLICY)
URLMatcherConditionSet::ID id = 0;
for (std::vector<std::string>::const_iterator it = patterns.begin();
it != patterns.end(); ++it) {
@@ -45,6 +46,7 @@ scoped_ptr<URLMatcher> CreateWhitelistOnBlockingPoolThread(
scheme, host, match_subdomains, port, path);
all_conditions.push_back(condition_set);
}
+#endif
url_matcher->AddConditionSets(all_conditions);
return url_matcher.Pass();
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698