Index: chrome/browser/managed_mode/managed_user_service.h |
diff --git a/chrome/browser/managed_mode/managed_user_service.h b/chrome/browser/managed_mode/managed_user_service.h |
index 3bcc321b4520da89805a012cfdb9b8a4ee9e1fef..3e7f056497e92ad5bc8a7bb88a317787aa6dd9b2 100644 |
--- a/chrome/browser/managed_mode/managed_user_service.h |
+++ b/chrome/browser/managed_mode/managed_user_service.h |
@@ -51,7 +51,6 @@ class ManagedUserService : public BrowserContextKeyedService, |
MANUAL_BLOCK |
}; |
- explicit ManagedUserService(Profile* profile); |
virtual ~ManagedUserService(); |
// ProfileKeyedService override: |
@@ -158,6 +157,7 @@ class ManagedUserService : public BrowserContextKeyedService, |
private: |
friend class ManagedUserServiceExtensionTest; |
+ friend class ManagedUserServiceFactory; |
// A bridge from ManagedMode (which lives on the UI thread) to the |
// ManagedModeURLFilters, one of which lives on the IO thread. This class |
@@ -189,6 +189,8 @@ class ManagedUserService : public BrowserContextKeyedService, |
DISALLOW_COPY_AND_ASSIGN(URLFilterContext); |
}; |
+ explicit ManagedUserService(Profile* profile); |
Bernhard Bauer
2013/07/09 14:19:40
Can you add a comment that explains how to get the
ibraaaa
2013/07/09 14:28:35
Done.
|
+ |
void OnCustodianProfileDownloaded(const string16& full_name); |
void OnManagedUserRegistered(const ProfileManager::CreateCallback& callback, |
@@ -236,6 +238,9 @@ class ManagedUserService : public BrowserContextKeyedService, |
// Sets a profile in elevated state for testing if set to true. |
bool elevated_for_testing_; |
+ // True only when |Shutdown()| method is called. |
Bernhard Bauer
2013/07/09 14:19:40
Nit: "has been called"
ibraaaa
2013/07/09 14:28:35
Done.
|
+ bool did_shutdown_; |
+ |
URLFilterContext url_filter_context_; |
}; |