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

Side by Side Diff: chrome/browser/managed_mode/managed_mode_url_filter.cc

Issue 102973005: Move URLBlacklistManager to components/policy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, fixed linkage of policy_component 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/net/chrome_network_delegate.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/managed_mode/managed_mode_url_filter.h" 5 #include "chrome/browser/managed_mode/managed_mode_url_filter.h"
6 6
7 #include "base/containers/hash_tables.h" 7 #include "base/containers/hash_tables.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/json/json_file_value_serializer.h" 9 #include "base/json/json_file_value_serializer.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
11 #include "base/sha1.h" 11 #include "base/sha1.h"
12 #include "base/strings/string_number_conversions.h" 12 #include "base/strings/string_number_conversions.h"
13 #include "base/strings/string_util.h" 13 #include "base/strings/string_util.h"
14 #include "base/task_runner_util.h" 14 #include "base/task_runner_util.h"
15 #include "base/threading/sequenced_worker_pool.h" 15 #include "base/threading/sequenced_worker_pool.h"
16 #include "chrome/browser/policy/url_blacklist_manager.h"
17 #include "chrome/common/net/url_fixer_upper.h" 16 #include "chrome/common/net/url_fixer_upper.h"
17 #include "components/policy/core/common/url_blacklist_manager.h"
18 #include "components/url_matcher/url_matcher.h" 18 #include "components/url_matcher/url_matcher.h"
19 #include "content/public/browser/browser_thread.h" 19 #include "content/public/browser/browser_thread.h"
20 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" 20 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
21 #include "url/gurl.h" 21 #include "url/gurl.h"
22 22
23 using content::BrowserThread; 23 using content::BrowserThread;
24 using net::registry_controlled_domains::EXCLUDE_UNKNOWN_REGISTRIES; 24 using net::registry_controlled_domains::EXCLUDE_UNKNOWN_REGISTRIES;
25 using net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES; 25 using net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES;
26 using net::registry_controlled_domains::GetRegistryLength; 26 using net::registry_controlled_domains::GetRegistryLength;
27 using policy::URLBlacklist; 27 using policy::URLBlacklist;
(...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 379
380 void ManagedModeURLFilter::RemoveObserver(Observer* observer) { 380 void ManagedModeURLFilter::RemoveObserver(Observer* observer) {
381 observers_.RemoveObserver(observer); 381 observers_.RemoveObserver(observer);
382 } 382 }
383 383
384 void ManagedModeURLFilter::SetContents(scoped_ptr<Contents> contents) { 384 void ManagedModeURLFilter::SetContents(scoped_ptr<Contents> contents) {
385 DCHECK(CalledOnValidThread()); 385 DCHECK(CalledOnValidThread());
386 contents_ = contents.Pass(); 386 contents_ = contents.Pass();
387 FOR_EACH_OBSERVER(Observer, observers_, OnSiteListUpdated()); 387 FOR_EACH_OBSERVER(Observer, observers_, OnSiteListUpdated());
388 } 388 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/net/chrome_network_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698