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

Unified Diff: chrome/browser/profiles/profile_manager.cc

Issue 2712883005: Sign out profile when local_state file has been changed. (Closed)
Patch Set: fixup Created 3 years, 10 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/profiles/profile_manager.cc
diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc
index 2735519ad44c3de93ba549f0c84a1cfce7d33e00..6a7e5c002458090d840cc413811e93717258ad73 100644
--- a/chrome/browser/profiles/profile_manager.cc
+++ b/chrome/browser/profiles/profile_manager.cc
@@ -53,6 +53,7 @@
#include "chrome/browser/signin/cross_device_promo_factory.h"
#include "chrome/browser/signin/gaia_cookie_manager_service_factory.h"
#include "chrome/browser/signin/signin_manager_factory.h"
+#include "chrome/browser/signin/signin_util.h"
#include "chrome/browser/sync/profile_sync_service_factory.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_list.h"
@@ -323,6 +324,13 @@ void OnProfileLoaded(
client_callback.Run(incognito ? profile->GetOffTheRecordProfile() : profile);
}
+#if !defined(OS_ANDROID) && !defined(OS_IOS) && !defined(OS_CHROMEOS)
+void SignOut(SigninManager* signin_manager) {
+ signin_manager->SignOut(signin_metrics::AUTHENTICATION_FAILED,
+ signin_metrics::SignoutDelete::IGNORE_METRIC);
+}
+#endif
+
} // namespace
ProfileManager::ProfileManager(const base::FilePath& user_data_dir)
@@ -1547,8 +1555,21 @@ void ProfileManager::AddProfileToStorage(Profile* profile) {
bool has_entry = storage.GetProfileAttributesWithPath(profile->GetPath(),
&entry);
if (has_entry) {
+#if !defined(OS_ANDROID) && !defined(OS_IOS) && !defined(OS_CHROMEOS)
+ bool previous_authenticated_status = entry->IsAuthenticated();
Roger Tawa OOO till Jul 10th 2017/02/27 22:08:26 nit: rename |previous_authenticated_status| to |wa
zmin 2017/03/07 20:06:41 Done.
+#endif
// The ProfileAttributesStorage's info must match the Signin Manager.
entry->SetAuthInfo(account_info.gaia, username);
+#if !defined(OS_ANDROID) && !defined(OS_IOS) && !defined(OS_CHROMEOS)
+ // Sign out if force-sign-in policy is enabled and profile is not signed
+ // in.
+ if (signin_util::IsForceSigninEnabled() &&
+ previous_authenticated_status && !entry->IsAuthenticated()) {
+ BrowserThread::PostTask(
+ BrowserThread::UI, FROM_HERE,
+ base::Bind(&SignOut, static_cast<SigninManager*>(signin_manager)));
+ }
+#endif
return;
}
}

Powered by Google App Engine
This is Rietveld 408576698