[cros login, new GAIA] New UI for not authorized error

chrome/browser/chromeos/login/existing_user_controller.cc

 // Copyright (c) 2012 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/existing_user_controller.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 673 matching lines @@
   if (auth_status_consumer_)
     auth_status_consumer_->OnPasswordChangeDetected();
 
   display_email_.clear();
 }
 
 void ExistingUserController::WhiteListCheckFailed(const std::string& email) {
   PerformLoginFinishedActions(true /* start public session timer */);
   offline_failed_ = false;
 
-  if (g_browser_process->platform_part()
-          ->browser_policy_connector_chromeos()
-          ->IsEnterpriseManaged()) {
-    ShowError(IDS_ENTERPRISE_LOGIN_ERROR_WHITELIST, email);
+  if (StartupUtils::IsWebviewSigninEnabled()) {
+    login_display_->ShowWhitelistCheckFailedError();
   } else {
-    ShowError(IDS_LOGIN_ERROR_WHITELIST, email);
+    if (g_browser_process->platform_part()
+            ->browser_policy_connector_chromeos()
+            ->IsEnterpriseManaged()) {
+      ShowError(IDS_ENTERPRISE_LOGIN_ERROR_WHITELIST, email);
+    } else {
+      ShowError(IDS_LOGIN_ERROR_WHITELIST, email);
+    }
+    login_display_->ShowSigninUI(email);
   }
 
-  if (StartupUtils::IsWebviewSigninEnabled())
-    login_display_->ShowSigninUI("");
-  else
-    login_display_->ShowSigninUI(email);
-
   if (auth_status_consumer_) {
     auth_status_consumer_->OnAuthFailure(
         AuthFailure(AuthFailure::WHITELIST_CHECK_FAILED));
   }
 
   display_email_.clear();
 }
 
 void ExistingUserController::PolicyLoadFailed() {
   ShowError(IDS_LOGIN_ERROR_OWNER_KEY_LOST, "");
@@ skipping 217 matching lines @@
           &ExistingUserController::OnPublicSessionAutoLoginTimerFire,
           weak_factory_.GetWeakPtr()));
 }
 
 gfx::NativeWindow ExistingUserController::GetNativeWindow() const {
   return host_->GetNativeWindow();
 }
 
 void ExistingUserController::ShowError(int error_id,
                                        const std::string& details) {
-  // TODO(dpolukhin): show detailed error info. |details| string contains
-  // low level error info that is not localized and even is not user friendly.
-  // For now just ignore it because error_text contains all required information
-  // for end users, developers can see details string in Chrome logs.
   VLOG(1) << details;
   HelpAppLauncher::HelpTopic help_topic_id;
-  bool is_offline = !network_state_helper_->IsConnected();
   switch (login_performer_->error().state()) {
-    case GoogleServiceAuthError::CONNECTION_FAILED:
-      help_topic_id = HelpAppLauncher::HELP_CANT_ACCESS_ACCOUNT_OFFLINE;
-      break;
     case GoogleServiceAuthError::ACCOUNT_DISABLED:
       help_topic_id = HelpAppLauncher::HELP_ACCOUNT_DISABLED;
       break;
     case GoogleServiceAuthError::HOSTED_NOT_ALLOWED:
       help_topic_id = HelpAppLauncher::HELP_HOSTED_ACCOUNT;
       break;
     default:
-      help_topic_id = is_offline ?
-          HelpAppLauncher::HELP_CANT_ACCESS_ACCOUNT_OFFLINE :
-          HelpAppLauncher::HELP_CANT_ACCESS_ACCOUNT;
+      help_topic_id = HelpAppLauncher::HELP_CANT_ACCESS_ACCOUNT;
       break;
   }
 
   if (error_id == IDS_LOGIN_ERROR_AUTHENTICATING) {
     if (num_login_attempts_ > 1) {
       const user_manager::User* user =
           user_manager::UserManager::Get()->FindUser(
               last_login_attempt_username_);
       if (user && (user->GetType() == user_manager::USER_TYPE_SUPERVISED))
         error_id = IDS_LOGIN_ERROR_AUTHENTICATING_2ND_TIME_SUPERVISED;
@@ skipping 228 matching lines @@
   ChromeUserManager::Get()->SetUserFlow(
       user_context.GetUserID(),
       new BootstrapUserFlow(
           user_context,
           bootstrap_user_context_initializer_->random_key_used()));
 
   PerformLogin(user_context, LoginPerformer::AUTH_MODE_EXTENSION);
 }
 
 }  // namespace chromeos