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

Unified Diff: chrome/browser/supervised_user/supervised_user_url_filter.h

Issue 335833003: Rename "managed (mode|user)" to "supervised user" (part 2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review comments (+ a few other cleanups) Created 6 years, 6 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/supervised_user/supervised_user_url_filter.h
diff --git a/chrome/browser/managed_mode/managed_mode_url_filter.h b/chrome/browser/supervised_user/supervised_user_url_filter.h
similarity index 82%
rename from chrome/browser/managed_mode/managed_mode_url_filter.h
rename to chrome/browser/supervised_user/supervised_user_url_filter.h
index c43326af939e2cfb72b6adea51fd059de0bb1a4b..338115653038940f4da5a68f791c13d681473e4d 100644
--- a/chrome/browser/managed_mode/managed_mode_url_filter.h
+++ b/chrome/browser/supervised_user/supervised_user_url_filter.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_MANAGED_MODE_MANAGED_MODE_URL_FILTER_H_
-#define CHROME_BROWSER_MANAGED_MODE_MANAGED_MODE_URL_FILTER_H_
+#ifndef CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_URL_FILTER_H_
+#define CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_URL_FILTER_H_
#include "base/callback_forward.h"
#include "base/memory/ref_counted.h"
@@ -12,8 +12,8 @@
#include "base/observer_list.h"
#include "base/threading/non_thread_safe.h"
#include "base/values.h"
-#include "chrome/browser/managed_mode/managed_mode_site_list.h"
-#include "chrome/browser/managed_mode/managed_users.h"
+#include "chrome/browser/supervised_user/supervised_user_site_list.h"
+#include "chrome/browser/supervised_user/supervised_users.h"
class GURL;
@@ -29,8 +29,8 @@ class GURL;
// References to it can be passed around on different threads (the refcounting
// is thread-safe), but the object itself should always be accessed on the same
// thread (member access isn't thread-safe).
-class ManagedModeURLFilter
- : public base::RefCountedThreadSafe<ManagedModeURLFilter>,
+class SupervisedUserURLFilter
+ : public base::RefCountedThreadSafe<SupervisedUserURLFilter>,
public base::NonThreadSafe {
public:
enum FilteringBehavior {
@@ -47,7 +47,7 @@ class ManagedModeURLFilter
struct Contents;
- ManagedModeURLFilter();
+ SupervisedUserURLFilter();
static FilteringBehavior BehaviorFromInt(int behavior_value);
@@ -66,7 +66,7 @@ class ManagedModeURLFilter
// or accounts.google.com).
// - If the pattern ends with ".*", it matches the host on any known TLD
// (e.g. the pattern "google.*" would match google.com or google.co.uk).
- // See the ManagedModeURLFilterTest.HostMatchesPattern unit test for more
+ // See the SupervisedUserURLFilterTest.HostMatchesPattern unit test for more
// examples.
// Asterisks in other parts of the pattern are not allowed.
// |host| and |pattern| are assumed to be normalized to lower-case.
@@ -75,7 +75,7 @@ class ManagedModeURLFilter
const std::string& pattern);
void GetSites(const GURL& url,
- std::vector<ManagedModeSiteList::Site*>* sites) const;
+ std::vector<SupervisedUserSiteList::Site*>* sites) const;
// Returns the filtering behavior for a given URL, based on the default
// behavior and whether it is on a site list.
@@ -87,7 +87,7 @@ class ManagedModeURLFilter
// Asynchronously loads the specified site lists from disk and updates the
// filter to recognize each site on them.
// Calls |continuation| when the filter has been updated.
- void LoadWhitelists(ScopedVector<ManagedModeSiteList> site_lists);
+ void LoadWhitelists(ScopedVector<SupervisedUserSiteList> site_lists);
// Set the list of matched patterns to the passed in list.
// This method is only used for testing.
@@ -103,8 +103,8 @@ class ManagedModeURLFilter
void RemoveObserver(Observer* observer);
private:
- friend class base::RefCountedThreadSafe<ManagedModeURLFilter>;
- ~ManagedModeURLFilter();
+ friend class base::RefCountedThreadSafe<SupervisedUserURLFilter>;
+ ~SupervisedUserURLFilter();
void SetContents(scoped_ptr<Contents> url_matcher);
@@ -121,7 +121,7 @@ class ManagedModeURLFilter
// (false).
std::map<std::string, bool> host_map_;
- DISALLOW_COPY_AND_ASSIGN(ManagedModeURLFilter);
+ DISALLOW_COPY_AND_ASSIGN(SupervisedUserURLFilter);
};
-#endif // CHROME_BROWSER_MANAGED_MODE_MANAGED_MODE_URL_FILTER_H_
+#endif // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_URL_FILTER_H_
« no previous file with comments | « chrome/browser/supervised_user/supervised_user_theme.cc ('k') | chrome/browser/supervised_user/supervised_user_url_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698