| 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..9c643c4efa9059c1e2642a7fc528c9ffca81af5a 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,10 @@ class ManagedUserService : public BrowserContextKeyedService,
|
| DISALLOW_COPY_AND_ASSIGN(URLFilterContext);
|
| };
|
|
|
| + // Use |ManagedUserServiceFactory::GetForProfile(..)| to get
|
| + // an instance of this service.
|
| + explicit ManagedUserService(Profile* profile);
|
| +
|
| void OnCustodianProfileDownloaded(const string16& full_name);
|
|
|
| void OnManagedUserRegistered(const ProfileManager::CreateCallback& callback,
|
| @@ -236,6 +240,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 has been called.
|
| + bool did_shutdown_;
|
| +
|
| URLFilterContext url_filter_context_;
|
| };
|
|
|
|
|