Implemented new UI for error messages on OOBE/Login.

chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

 // Copyright (c) 2013 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/ui/webui/chromeos/login/signin_screen_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 362 matching lines @@
       l10n_util::GetStringUTF16(IDS_BROWSE_WITHOUT_SIGNING_IN_HTML));
   localized_strings->SetString("createLocallyManagedUser",
       l10n_util::GetStringUTF16(IDS_CREATE_LOCALLY_MANAGED_USER_HTML));
   localized_strings->SetString("offlineLogin",
       l10n_util::GetStringUTF16(IDS_OFFLINE_LOGIN_HTML));
   localized_strings->SetString("ownerUserPattern",
       l10n_util::GetStringUTF16(
           IDS_LOGIN_POD_OWNER_USER));
   localized_strings->SetString("removeUser",
       l10n_util::GetStringUTF16(IDS_LOGIN_POD_REMOVE_USER));
-  localized_strings->SetString("errorTpmFailure",
-      l10n_util::GetStringUTF16(IDS_LOGIN_ERROR_TPM_FAILURE));
+  localized_strings->SetString("errorTpmFailureTitle",
+      l10n_util::GetStringUTF16(IDS_LOGIN_ERROR_TPM_FAILURE_TITLE));
   localized_strings->SetString("errorTpmFailureReboot",
-      l10n_util::GetStringFUTF16(
-          IDS_LOGIN_ERROR_TPM_FAILURE_REBOOT,
-          l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME)));
+      l10n_util::GetStringUTF16(IDS_LOGIN_ERROR_TPM_FAILURE_REBOOT));
+  localized_strings->SetString("errorTpmFailureRebootButton",
+      l10n_util::GetStringUTF16(IDS_LOGIN_ERROR_TPM_FAILURE_REBOOT_BUTTON));
   localized_strings->SetString("disabledAddUserTooltip",
       l10n_util::GetStringUTF16(
           g_browser_process->browser_policy_connector()->IsEnterpriseManaged() ?
             IDS_DISABLED_ADD_USER_TOOLTIP_ENTERPRISE :
             IDS_DISABLED_ADD_USER_TOOLTIP));
 
   // Strings used by password changed dialog.
   localized_strings->SetString("passwordChangedTitle",
       l10n_util::GetStringUTF16(IDS_LOGIN_PASSWORD_CHANGED_TITLE));
   localized_strings->SetString("passwordChangedDesc",
@@ skipping 372 matching lines @@
   web_ui()->RegisterMessageCallback("showLocallyManagedUserCreationScreen",
       base::Bind(
           &SigninScreenHandler::HandleShowLocallyManagedUserCreationScreen,
           base::Unretained(this)));
   web_ui()->RegisterMessageCallback("launchPublicAccount",
       base::Bind(&SigninScreenHandler::HandleLaunchPublicAccount,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("offlineLogin",
       base::Bind(&SigninScreenHandler::HandleOfflineLogin,
                  base::Unretained(this)));
+  web_ui()->RegisterMessageCallback("rebootSystem",
+      base::Bind(&SigninScreenHandler::HandleRebootSystem,
+                 base::Unretained(this)));
   web_ui()->RegisterMessageCallback("showAddUser",
       base::Bind(&SigninScreenHandler::HandleShowAddUser,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("shutdownSystem",
       base::Bind(&SigninScreenHandler::HandleShutdownSystem,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("loadWallpaper",
       base::Bind(&SigninScreenHandler::HandleLoadWallpaper,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("removeUser",
@@ skipping 442 matching lines @@
   }
   if (!args->GetString(0, &email_))
     email_.clear();
   // Load auth extension. Parameters are: force reload, do not load extension in
   // background, use offline version.
   LoadAuthExtension(true, false, true);
   UpdateUIState(UI_STATE_GAIA_SIGNIN, NULL);
 }
 
 void SigninScreenHandler::HandleShutdownSystem(const base::ListValue* args) {
-#if defined(USE_AURA)
-  // Display the shutdown animation before actually requesting shutdown.
   ash::Shell::GetInstance()->session_state_controller()->RequestShutdown();
-#else
-  DBusThreadManager::Get()->GetPowerManagerClient()->RequestShutdown();
-#endif
 }
 
 void SigninScreenHandler::HandleLoadWallpaper(const base::ListValue* args) {
   if (!delegate_)
     return;
 
   std::string email;
   if (!args->GetString(0, &email)) {
     NOTREACHED();
     return;
   }
 
   delegate_->LoadWallpaper(email);
 }
 
+void SigninScreenHandler::HandleRebootSystem(const base::ListValue* args) {
+  chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->RequestRestart();
+}
+
 void SigninScreenHandler::HandleRemoveUser(const base::ListValue* args) {
   if (!delegate_)
     return;
 
   std::string email;
   if (!args->GetString(0, &email)) {
     NOTREACHED();
     return;
   }
 
@@ skipping 572 matching lines @@
   if (!cros_settings)
     return false;
 
   // Offline login is allowed only when user pods are hidden.
   bool show_pods;
   cros_settings->GetBoolean(kAccountsPrefShowUserNamesOnSignIn, &show_pods);
   return !show_pods;
 }
 
 }  // namespace chromeos