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

Unified Diff: chrome/browser/profiles/profile_io_data.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
« no previous file with comments | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/browser/profiles/profile_io_data.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/profile_io_data.h
diff --git a/chrome/browser/profiles/profile_io_data.h b/chrome/browser/profiles/profile_io_data.h
index 8b310a9a1a5e11a8351e0ccf1d35611bdf2f2f35..bbe1aced678a1e2a83203e77c740560d1d7ca996 100644
--- a/chrome/browser/profiles/profile_io_data.h
+++ b/chrome/browser/profiles/profile_io_data.h
@@ -33,10 +33,10 @@ class ChromeNetworkDelegate;
class CookieSettings;
class DevToolsNetworkController;
class HostContentSettingsMap;
-class ManagedModeURLFilter;
class MediaDeviceIDSalt;
class ProtocolHandlerRegistry;
class SigninNamesOnIOThread;
+class SupervisedUserURLFilter;
namespace extensions {
class InfoMap;
@@ -221,8 +221,8 @@ class ProfileIOData {
#endif
#if defined(ENABLE_MANAGED_USERS)
- const ManagedModeURLFilter* managed_mode_url_filter() const {
- return managed_mode_url_filter_.get();
+ const SupervisedUserURLFilter* supervised_user_url_filter() const {
+ return supervised_user_url_filter_.get();
}
#endif
@@ -302,7 +302,7 @@ class ProfileIOData {
scoped_ptr<net::ProxyConfigService> proxy_config_service;
#if defined(ENABLE_MANAGED_USERS)
- scoped_refptr<const ManagedModeURLFilter> managed_mode_url_filter;
+ scoped_refptr<const SupervisedUserURLFilter> supervised_user_url_filter;
#endif
#if defined(OS_CHROMEOS)
@@ -579,7 +579,8 @@ class ProfileIOData {
chrome_http_user_agent_settings_;
#if defined(ENABLE_MANAGED_USERS)
- mutable scoped_refptr<const ManagedModeURLFilter> managed_mode_url_filter_;
+ mutable scoped_refptr<const SupervisedUserURLFilter>
+ supervised_user_url_filter_;
#endif
mutable scoped_ptr<DevToolsNetworkController> network_controller_;
« no previous file with comments | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/browser/profiles/profile_io_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698