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

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

Issue 11496007: Fixed error screen behaviour when gaia frame loading is timed out. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/error_screen_handler.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 ab717385c4a993e5cc6fd14a42987c1afe4c1970..6270d8435777517ab35ba33f88e1dc828874778d 100644
--- a/chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc
@@ -327,6 +327,15 @@ void ErrorScreenHandler::HandleErrorScreenUpdate(const base::ListValue* args) {
false);
}
+void ErrorScreenHandler::HandleShowLoadingTimeoutError(
+ const base::ListValue* args) {
+ UpdateStateInternal(network_state_informer_->state(),
+ network_state_informer_->network_name(),
+ kErrorReasonLoadingTimeout,
+ network_state_informer_->last_network_type(),
+ false);
+}
+
void ErrorScreenHandler::HandleUpdateGaiaIsLocal(const base::ListValue* args) {
DCHECK(args && args->GetSize() == 1);
@@ -349,6 +358,9 @@ void ErrorScreenHandler::RegisterMessages() {
web_ui()->RegisterMessageCallback("errorScreenUpdate",
base::Bind(&ErrorScreenHandler::HandleErrorScreenUpdate,
base::Unretained(this)));
+ web_ui()->RegisterMessageCallback("showLoadingTimeoutError",
+ base::Bind(&ErrorScreenHandler::HandleShowLoadingTimeoutError,
+ base::Unretained(this)));
web_ui()->RegisterMessageCallback("updateGaiaIsLocal",
base::Bind(&ErrorScreenHandler::HandleUpdateGaiaIsLocal,
base::Unretained(this)));
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/error_screen_handler.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698