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

Unified Diff: chrome/browser/chromeos/login/ui/webui_login_display.cc

Issue 1012083002: Resolve new GAIA flow's infinite loop. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix test. Created 5 years, 9 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/chromeos/login/ui/webui_login_display.cc
diff --git a/chrome/browser/chromeos/login/ui/webui_login_display.cc b/chrome/browser/chromeos/login/ui/webui_login_display.cc
index 2e96623f1c75847ace8c57ee7f850380316d3a0c..8b4c5ff652df9b4f4cee317597255dd5a680ff87 100644
--- a/chrome/browser/chromeos/login/ui/webui_login_display.cc
+++ b/chrome/browser/chromeos/login/ui/webui_login_display.cc
@@ -8,6 +8,7 @@
#include "chrome/browser/chromeos/login/lock/screen_locker.h"
#include "chrome/browser/chromeos/login/screens/chrome_user_selection_screen.h"
#include "chrome/browser/chromeos/login/signin_screen_controller.h"
+#include "chrome/browser/chromeos/login/startup_utils.h"
#include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
#include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
#include "chrome/browser/chromeos/login/ui/webui_login_view.h"
@@ -95,7 +96,8 @@ void WebUILoginDisplay::SetUIEnabled(bool is_enabled) {
// If this call is made after new user signs in but login screen is still
// around that would trigger a sign in extension refresh.
if (is_enabled && (!user_manager::UserManager::Get()->IsUserLoggedIn() ||
- ScreenLocker::default_screen_locker())) {
+ ScreenLocker::default_screen_locker()) &&
+ !StartupUtils::IsWebviewSigninEnabled()) {
ClearAndEnablePassword();
}

Powered by Google App Engine
This is Rietveld 408576698