Resolve new GAIA flow's infinite loop.

chrome/browser/chromeos/login/ui/webui_login_display.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/ui/webui_login_display.h"
 
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #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"
 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/login/user_names.h"
 #include "components/user_manager/user_manager.h"
@@ skipping 67 matching lines @@
     webui_handler_->OnPreferencesChanged();
 }
 
 void WebUILoginDisplay::SetUIEnabled(bool is_enabled) {
   // TODO(nkostylev): Cleanup this condition,
   // see http://crbug.com/157885 and http://crbug.com/158255.
   // Allow this call only before user sign in or at lock screen.
   // 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();
   }
 
   if (chromeos::LoginDisplayHost* host =
           chromeos::LoginDisplayHostImpl::default_host()) {
     if (chromeos::WebUILoginView* login_view = host->GetWebUILoginView())
       login_view->SetUIEnabled(is_enabled);
   }
 }
 
@@ skipping 215 matching lines @@
   delegate_->Signout();
 }
 
 void WebUILoginDisplay::OnUserActivity(const ui::Event* event) {
   if (delegate_)
     delegate_->ResetPublicSessionAutoLoginTimer();
 }
 
 
 }  // namespace chromeos