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

Unified Diff: chrome/browser/profiles/profile_io_data.h

Issue 11826059: Add ManagedUserService for profile-specific managed user data. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync Created 7 years, 11 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/prefs/browser_prefs.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 caa5faa9bac45564993c6040f8b0576a7ae1f659..5960633c02f4cef19117d5983087b86723f6b420 100644
--- a/chrome/browser/profiles/profile_io_data.h
+++ b/chrome/browser/profiles/profile_io_data.h
@@ -30,6 +30,7 @@ class CookieSettings;
class DesktopNotificationService;
class ExtensionInfoMap;
class HostContentSettingsMap;
+class ManagedModeURLFilter;
class Profile;
class ProtocolHandlerRegistry;
class SigninNamesOnIOThread;
@@ -158,6 +159,12 @@ class ProfileIOData {
return resource_prefetch_predictor_observer_.get();
}
+#if !defined(OS_ANDROID)
+ const ManagedModeURLFilter* managed_mode_url_filter() const {
+ return managed_mode_url_filter_.get();
+ }
+#endif
+
// Initialize the member needed to track the metrics enabled state. This is
// only to be called on the UI thread.
void InitializeMetricsEnabledStateOnUIThread();
@@ -234,6 +241,11 @@ class ProfileIOData {
// because on linux it relies on initializing things through gconf,
// and needs to be on the main thread.
scoped_ptr<net::ProxyConfigService> proxy_config_service;
+
+#if !defined(OS_ANDROID)
+ scoped_refptr<const ManagedModeURLFilter> managed_mode_url_filter;
+#endif
+
// The profile this struct was populated from. It's passed as a void* to
// ensure it's not accidently used on the IO thread. Before using it on the
// UI thread, call ProfileManager::IsValidProfile to ensure it's alive.
@@ -475,6 +487,10 @@ class ProfileIOData {
mutable chrome_browser_net::LoadTimeStats* load_time_stats_;
+#if !defined(OS_ANDROID)
willchan no longer on Chromium 2013/01/16 17:15:40 We should really do something instead like ENABLE_
Bernhard Bauer 2013/01/17 13:49:49 Yeah, that's reasonable. Done!
+ mutable scoped_refptr<const ManagedModeURLFilter> managed_mode_url_filter_;
+#endif
+
// TODO(jhawkins): Remove once crbug.com/102004 is fixed.
bool initialized_on_UI_thread_;
« no previous file with comments | « chrome/browser/prefs/browser_prefs.cc ('k') | chrome/browser/profiles/profile_io_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698