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

Unified Diff: chrome/browser/ui/webui/options/browser_options_handler.cc

Issue 12502017: signin: pull basic SigninManager functionality into new SigninManagerBase class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: deal with new enterprise_platform_keys_private_api Created 7 years, 8 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/ui/webui/options/browser_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index e0e0c8e0e41f8a5de4e3dd9c038ecf93490587eb..29f249c4b474a2d1fca6448e8c2a4dbac24b06c2 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -1171,12 +1171,17 @@ scoped_ptr<DictionaryValue> BrowserOptionsHandler::GetSyncStateDictionary() {
return sync_status.Pass();
}
+ bool signout_prohibited = false;
+#if !defined(OS_CHROMEOS)
// Signout is not allowed if the user has policy (crbug.com/172204).
- SigninManager* signin = SigninManagerFactory::GetForProfile(profile);
- DCHECK(signin);
- sync_status->SetBoolean("signoutAllowed", !signin->IsSignoutProhibited());
+ signout_prohibited =
+ SigninManagerFactory::GetForProfile(profile)->IsSignoutProhibited();
+#endif
+
ProfileSyncService* service(
ProfileSyncServiceFactory::GetInstance()->GetForProfile(profile));
+ SigninManagerBase* signin = service->signin();
+ sync_status->SetBoolean("signoutAllowed", !signout_prohibited);
sync_status->SetBoolean("signinAllowed", signin->IsSigninAllowed());
sync_status->SetBoolean("syncSystemEnabled", !!service);
sync_status->SetBoolean("setupCompleted",
« no previous file with comments | « chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc ('k') | chrome/browser/ui/webui/sync_setup_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698