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

Unified Diff: chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc

Issue 79113002: kiosk: Network connectivity test during launch. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, add policy and only show network error screen once Created 7 years 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/ui/webui/chromeos/login/error_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc
index 978a67a8b23402bb80cc2d55b0e55b7b00b40d0e..ef446805f7ccb181b388ca3251ba714e20158226 100644
--- a/chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc
@@ -15,6 +15,7 @@
#include "chrome/browser/ui/webui/chromeos/login/native_window_delegate.h"
#include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h"
#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/power_manager_client.h"
#include "chromeos/dbus/session_manager_client.h"
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
@@ -140,6 +141,10 @@ void ErrorScreenHandler::HandleLocalStateErrorPowerwashButtonClicked() {
StartDeviceWipe();
}
+void ErrorScreenHandler::HandleRebootButtonClicked() {
+ chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->RequestRestart();
+}
+
void ErrorScreenHandler::RegisterMessages() {
AddCallback("showCaptivePortal",
&ErrorScreenHandler::HandleShowCaptivePortal);
@@ -147,6 +152,8 @@ void ErrorScreenHandler::RegisterMessages() {
&ErrorScreenHandler::HandleHideCaptivePortal);
AddCallback("localStateErrorPowerwashButtonClicked",
&ErrorScreenHandler::HandleLocalStateErrorPowerwashButtonClicked);
+ AddCallback("rebootButtonClicked",
+ &ErrorScreenHandler::HandleRebootButtonClicked);
}
void ErrorScreenHandler::DeclareLocalizedValues(
@@ -168,6 +175,7 @@ void ErrorScreenHandler::DeclareLocalizedValues(
builder->Add("localStateErrorText1", IDS_LOCAL_STATE_ERROR_TEXT_1);
builder->Add("localStateErrorPowerwashButton",
IDS_LOCAL_STATE_ERROR_POWERWASH_BUTTON);
+ builder->Add("rebootButton", IDS_REBOOT_BUTTON);
}
void ErrorScreenHandler::Initialize() {

Powered by Google App Engine
This is Rietveld 408576698