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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/resources/chromeos/login/oobe_screen_update.js ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/chromeos/login/update_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/update_screen_handler.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" 9 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
10 #include "grit/chromium_strings.h" 10 #include "grit/chromium_strings.h"
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 screen_ = screen; 67 screen_ = screen;
68 } 68 }
69 69
70 void UpdateScreenHandler::Show() { 70 void UpdateScreenHandler::Show() {
71 if (!page_is_ready()) { 71 if (!page_is_ready()) {
72 show_on_init_ = true; 72 show_on_init_ = true;
73 return; 73 return;
74 } 74 }
75 ShowScreen(OobeUI::kScreenOobeUpdate, NULL); 75 ShowScreen(OobeUI::kScreenOobeUpdate, NULL);
76 #if !defined(OFFICIAL_BUILD) 76 #if !defined(OFFICIAL_BUILD)
77 CallJS("login.UpdateScreen.enableUpdateCancel"); 77 CallJS("enableUpdateCancel");
78 #endif 78 #endif
79 } 79 }
80 80
81 void UpdateScreenHandler::Hide() { 81 void UpdateScreenHandler::Hide() {
82 } 82 }
83 83
84 void UpdateScreenHandler::PrepareToShow() { 84 void UpdateScreenHandler::PrepareToShow() {
85 } 85 }
86 86
87 void UpdateScreenHandler::ShowManualRebootInfo() { 87 void UpdateScreenHandler::ShowManualRebootInfo() {
88 CallJS("cr.ui.Oobe.setUpdateMessage", 88 CallJS("setUpdateMessage", l10n_util::GetStringUTF16(IDS_UPDATE_COMPLETED));
89 l10n_util::GetStringUTF16(IDS_UPDATE_COMPLETED));
90 } 89 }
91 90
92 void UpdateScreenHandler::SetProgress(int progress) { 91 void UpdateScreenHandler::SetProgress(int progress) {
93 CallJS("cr.ui.Oobe.setUpdateProgress", progress); 92 CallJS("setUpdateProgress", progress);
94 } 93 }
95 94
96 void UpdateScreenHandler::ShowEstimatedTimeLeft(bool visible) { 95 void UpdateScreenHandler::ShowEstimatedTimeLeft(bool visible) {
97 CallJS("cr.ui.Oobe.showEstimatedTimeLeft", visible); 96 CallJS("showEstimatedTimeLeft", visible);
98 } 97 }
99 98
100 void UpdateScreenHandler::SetEstimatedTimeLeft(const base::TimeDelta& time) { 99 void UpdateScreenHandler::SetEstimatedTimeLeft(const base::TimeDelta& time) {
101 CallJS("cr.ui.Oobe.setEstimatedTimeLeft", time.InSecondsF()); 100 CallJS("setEstimatedTimeLeft", time.InSecondsF());
102 } 101 }
103 102
104 void UpdateScreenHandler::ShowProgressMessage(bool visible) { 103 void UpdateScreenHandler::ShowProgressMessage(bool visible) {
105 CallJS("cr.ui.Oobe.showProgressMessage", visible); 104 CallJS("showProgressMessage", visible);
106 } 105 }
107 106
108 void UpdateScreenHandler::SetProgressMessage(ProgressMessage message) { 107 void UpdateScreenHandler::SetProgressMessage(ProgressMessage message) {
109 scoped_ptr<StringValue> progress_message; 108 scoped_ptr<StringValue> progress_message;
110 switch (message) { 109 switch (message) {
111 case PROGRESS_MESSAGE_UPDATE_AVAILABLE: 110 case PROGRESS_MESSAGE_UPDATE_AVAILABLE:
112 progress_message.reset(Value::CreateStringValue( 111 progress_message.reset(Value::CreateStringValue(
113 l10n_util::GetStringUTF16(IDS_UPDATE_AVAILABLE))); 112 l10n_util::GetStringUTF16(IDS_UPDATE_AVAILABLE)));
114 break; 113 break;
115 case PROGRESS_MESSAGE_INSTALLING_UPDATE: 114 case PROGRESS_MESSAGE_INSTALLING_UPDATE:
116 progress_message.reset(Value::CreateStringValue( 115 progress_message.reset(Value::CreateStringValue(
117 l10n_util::GetStringFUTF16(IDS_INSTALLING_UPDATE, 116 l10n_util::GetStringFUTF16(IDS_INSTALLING_UPDATE,
118 l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME)))); 117 l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME))));
119 break; 118 break;
120 case PROGRESS_MESSAGE_VERIFYING: 119 case PROGRESS_MESSAGE_VERIFYING:
121 progress_message.reset(Value::CreateStringValue( 120 progress_message.reset(Value::CreateStringValue(
122 l10n_util::GetStringUTF16(IDS_UPDATE_VERIFYING))); 121 l10n_util::GetStringUTF16(IDS_UPDATE_VERIFYING)));
123 break; 122 break;
124 case PROGRESS_MESSAGE_FINALIZING: 123 case PROGRESS_MESSAGE_FINALIZING:
125 progress_message.reset(Value::CreateStringValue( 124 progress_message.reset(Value::CreateStringValue(
126 l10n_util::GetStringUTF16(IDS_UPDATE_FINALIZING))); 125 l10n_util::GetStringUTF16(IDS_UPDATE_FINALIZING)));
127 break; 126 break;
128 default: 127 default:
129 NOTREACHED(); 128 NOTREACHED();
130 }; 129 };
131 if (progress_message.get()) 130 if (progress_message.get())
132 CallJS("cr.ui.Oobe.setProgressMessage", *progress_message); 131 CallJS("setProgressMessage", *progress_message);
133 } 132 }
134 133
135 void UpdateScreenHandler::ShowCurtain(bool visible) { 134 void UpdateScreenHandler::ShowCurtain(bool visible) {
136 CallJS("cr.ui.Oobe.showUpdateCurtain", visible); 135 CallJS("showUpdateCurtain", visible);
137 } 136 }
138 137
139 void UpdateScreenHandler::RegisterMessages() { 138 void UpdateScreenHandler::RegisterMessages() {
140 #if !defined(OFFICIAL_BUILD) 139 #if !defined(OFFICIAL_BUILD)
141 AddCallback("cancelUpdate", &UpdateScreenHandler::HandleUpdateCancel); 140 AddCallback("cancelUpdate", &UpdateScreenHandler::HandleUpdateCancel);
142 #endif 141 #endif
143 } 142 }
144 143
145 void UpdateScreenHandler::OnConnectToNetworkRequested( 144 void UpdateScreenHandler::OnConnectToNetworkRequested(
146 const std::string& service_path) { 145 const std::string& service_path) {
147 if (screen_) 146 if (screen_)
148 screen_->OnConnectToNetworkRequested(service_path); 147 screen_->OnConnectToNetworkRequested(service_path);
149 } 148 }
150 149
151 #if !defined(OFFICIAL_BUILD) 150 #if !defined(OFFICIAL_BUILD)
152 void UpdateScreenHandler::HandleUpdateCancel() { 151 void UpdateScreenHandler::HandleUpdateCancel() {
153 screen_->CancelUpdate(); 152 screen_->CancelUpdate();
154 } 153 }
155 #endif 154 #endif
156 155
157 } // namespace chromeos 156 } // namespace chromeos
OLDNEW
« 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