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

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

Issue 22453006: Fixed calls to JS side from the UpdateScreen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Deleted stub methods from login.js Created 7 years, 4 months 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/resources/chromeos/login/oobe_screen_update.js ('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/update_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/update_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/update_screen_handler.cc
index 6577a31d66d58cc1fabd4cb512484e5ea00fe74e..d75476f8233ba536e6afefad0599b5e35432326b 100644
--- a/chrome/browser/ui/webui/chromeos/login/update_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/update_screen_handler.cc
@@ -74,7 +74,7 @@ void UpdateScreenHandler::Show() {
}
ShowScreen(OobeUI::kScreenOobeUpdate, NULL);
#if !defined(OFFICIAL_BUILD)
- CallJS("login.UpdateScreen.enableUpdateCancel");
+ CallJS("enableUpdateCancel");
#endif
}
@@ -85,24 +85,23 @@ void UpdateScreenHandler::PrepareToShow() {
}
void UpdateScreenHandler::ShowManualRebootInfo() {
- CallJS("cr.ui.Oobe.setUpdateMessage",
- l10n_util::GetStringUTF16(IDS_UPDATE_COMPLETED));
+ CallJS("setUpdateMessage", l10n_util::GetStringUTF16(IDS_UPDATE_COMPLETED));
}
void UpdateScreenHandler::SetProgress(int progress) {
- CallJS("cr.ui.Oobe.setUpdateProgress", progress);
+ CallJS("setUpdateProgress", progress);
}
void UpdateScreenHandler::ShowEstimatedTimeLeft(bool visible) {
- CallJS("cr.ui.Oobe.showEstimatedTimeLeft", visible);
+ CallJS("showEstimatedTimeLeft", visible);
}
void UpdateScreenHandler::SetEstimatedTimeLeft(const base::TimeDelta& time) {
- CallJS("cr.ui.Oobe.setEstimatedTimeLeft", time.InSecondsF());
+ CallJS("setEstimatedTimeLeft", time.InSecondsF());
}
void UpdateScreenHandler::ShowProgressMessage(bool visible) {
- CallJS("cr.ui.Oobe.showProgressMessage", visible);
+ CallJS("showProgressMessage", visible);
}
void UpdateScreenHandler::SetProgressMessage(ProgressMessage message) {
@@ -129,11 +128,11 @@ void UpdateScreenHandler::SetProgressMessage(ProgressMessage message) {
NOTREACHED();
};
if (progress_message.get())
- CallJS("cr.ui.Oobe.setProgressMessage", *progress_message);
+ CallJS("setProgressMessage", *progress_message);
}
void UpdateScreenHandler::ShowCurtain(bool visible) {
- CallJS("cr.ui.Oobe.showUpdateCurtain", visible);
+ CallJS("showUpdateCurtain", visible);
}
void UpdateScreenHandler::RegisterMessages() {
« no previous file with comments | « chrome/browser/resources/chromeos/login/oobe_screen_update.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698