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

Unified Diff: chrome/browser/supervised_user/supervised_user_service_factory.cc

Issue 2847803008: ProfileSyncService: Handle null SupervisedUserService (Closed)
Patch Set: Merge remote-tracking branch 'refs/remotes/origin/master' into dep Created 3 years, 7 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_service_factory.cc
diff --git a/chrome/browser/supervised_user/supervised_user_service_factory.cc b/chrome/browser/supervised_user/supervised_user_service_factory.cc
index 16646528a7bca4cf4b08bf75b90eced337625156..09ceffd380f36c691586a31416d5ade959f16c09 100644
--- a/chrome/browser/supervised_user/supervised_user_service_factory.cc
+++ b/chrome/browser/supervised_user/supervised_user_service_factory.cc
@@ -25,6 +25,13 @@ SupervisedUserService* SupervisedUserServiceFactory::GetForProfile(
}
// static
+SupervisedUserService* SupervisedUserServiceFactory::GetForProfileIfExists(
+ Profile* profile) {
+ return static_cast<SupervisedUserService*>(
+ GetInstance()->GetServiceForBrowserContext(profile, /*create=*/false));
+}
+
+// static
SupervisedUserServiceFactory* SupervisedUserServiceFactory::GetInstance() {
return base::Singleton<SupervisedUserServiceFactory>::get();
}
@@ -43,8 +50,6 @@ SupervisedUserServiceFactory::SupervisedUserServiceFactory()
extensions::ExtensionsBrowserClient::Get()->GetExtensionSystemFactory());
#endif
DependsOn(ProfileOAuth2TokenServiceFactory::GetInstance());
-
- // TODO(skym, crbug.com/705545): Fix this circular dependency.
DependsOn(ProfileSyncServiceFactory::GetInstance());
}
« no previous file with comments | « chrome/browser/supervised_user/supervised_user_service_factory.h ('k') | chrome/browser/sync/chrome_sync_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698