diff options
| author | pliard@chromium.org <pliard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-20 22:10:20 +0000 |
|---|---|---|
| committer | pliard@chromium.org <pliard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-20 22:10:20 +0000 |
| commit | 4d50036b38abbf87b025cca51e4c1171e60c3ef5 (patch) | |
| tree | ef6ccef9a4e9bc7e6421857374638d588105e4de | |
| parent | 33c66e3473573743888019bd0e97eee01f548f81 (diff) | |
| download | chromium_src-4d50036b38abbf87b025cca51e4c1171e60c3ef5.zip chromium_src-4d50036b38abbf87b025cca51e4c1171e60c3ef5.tar.gz chromium_src-4d50036b38abbf87b025cca51e4c1171e60c3ef5.tar.bz2 | |
Disable uses of URLBlacklist on platforms that don't support it.
This was causing linking issues on the Linux Redux bot.
Review URL: https://chromiumcodereview.appspot.com/10827411
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152396 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/managed_mode_url_filter.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/managed_mode_url_filter.cc b/chrome/browser/managed_mode_url_filter.cc index 778af3d..26a8578 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(); } |