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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc

Issue 307733003: Tiny fixes for reset screen A11y. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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_reset.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/reset_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 builder->Add("resetScreenIconTitle",IDS_RESET_SCREEN_ICON_TITLE); 173 builder->Add("resetScreenIconTitle",IDS_RESET_SCREEN_ICON_TITLE);
174 builder->Add("cancelButton", IDS_CANCEL); 174 builder->Add("cancelButton", IDS_CANCEL);
175 175
176 builder->Add("resetWarningDataDetails", 176 builder->Add("resetWarningDataDetails",
177 IDS_RESET_SCREEN_WARNING_DETAILS_DATA); 177 IDS_RESET_SCREEN_WARNING_DETAILS_DATA);
178 builder->Add("resetRestartMessage", IDS_RESET_SCREEN_RESTART_MSG); 178 builder->Add("resetRestartMessage", IDS_RESET_SCREEN_RESTART_MSG);
179 builder->AddF("resetRollbackOption", 179 builder->AddF("resetRollbackOption",
180 IDS_RESET_SCREEN_ROLLBACK_OPTION, 180 IDS_RESET_SCREEN_ROLLBACK_OPTION,
181 IDS_SHORT_PRODUCT_NAME); 181 IDS_SHORT_PRODUCT_NAME);
182 builder->AddF("resetRevertPromise", 182 builder->AddF("resetRevertPromise",
183 IDS_RESET_SCREEN_PREPARING_REVERT_PROMISE, 183 IDS_RESET_SCREEN_PREPARING_REVERT_PROMISE,
184 IDS_SHORT_PRODUCT_NAME); 184 IDS_SHORT_PRODUCT_NAME);
185 builder->AddF("resetRevertSpinnerMessage", 185 builder->AddF("resetRevertSpinnerMessage",
186 IDS_RESET_SCREEN_PREPARING_REVERT_SPINNER_MESSAGE, 186 IDS_RESET_SCREEN_PREPARING_REVERT_SPINNER_MESSAGE,
187 IDS_SHORT_PRODUCT_NAME); 187 IDS_SHORT_PRODUCT_NAME);
188 188
189 // Different variants of the same UI elements for all dialog cases. 189 // Different variants of the same UI elements for all dialog cases.
190 builder->Add("resetButtonReset", IDS_RESET_SCREEN_RESET); 190 builder->Add("resetButtonReset", IDS_RESET_SCREEN_RESET);
191 builder->Add("resetButtonRelaunch", IDS_RELAUNCH_BUTTON); 191 builder->Add("resetButtonRelaunch", IDS_RELAUNCH_BUTTON);
192 builder->Add("resetButtonPowerwash", IDS_RESET_SCREEN_POWERWASH); 192 builder->Add("resetButtonPowerwash", IDS_RESET_SCREEN_POWERWASH);
193 193
194 builder->AddF( 194 builder->AddF(
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 prefs->SetBoolean(prefs::kFactoryResetRequested, true); 249 prefs->SetBoolean(prefs::kFactoryResetRequested, true);
250 prefs->SetBoolean(prefs::kRollbackRequested, should_rollback); 250 prefs->SetBoolean(prefs::kRollbackRequested, should_rollback);
251 prefs->CommitPendingWrite(); 251 prefs->CommitPendingWrite();
252 252
253 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->RequestRestart(); 253 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->RequestRestart();
254 } 254 }
255 255
256 void ResetScreenHandler::HandleOnPowerwash(bool rollback_checked) { 256 void ResetScreenHandler::HandleOnPowerwash(bool rollback_checked) {
257 if (rollback_available_ && (rollback_checked || reboot_was_requested_)) { 257 if (rollback_available_ && (rollback_checked || reboot_was_requested_)) {
258 CallJS("updateViewOnRollbackCall"); 258 CallJS("updateViewOnRollbackCall");
259 DBusThreadManager::Get()->GetUpdateEngineClient()->AddObserver(this); 259 // DBusThreadManager::Get()->GetUpdateEngineClient()->AddObserver(this);
260 chromeos::DBusThreadManager::Get()->GetUpdateEngineClient()->Rollback(); 260 // chromeos::DBusThreadManager::Get()->GetUpdateEngineClient()->Rollback();
261 } else { 261 } else {
262 if (rollback_checked && !rollback_available_) { 262 if (rollback_checked && !rollback_available_) {
263 NOTREACHED() << 263 NOTREACHED() <<
264 "Rollback was checked but not available. Starting powerwash."; 264 "Rollback was checked but not available. Starting powerwash.";
265 } 265 }
266 chromeos::DBusThreadManager::Get()->GetSessionManagerClient()-> 266 // chromeos::DBusThreadManager::Get()->GetSessionManagerClient()->
267 StartDeviceWipe(); 267 // StartDeviceWipe();
dzhioev (left Google) 2014/05/29 13:42:55 Are you sure about these changes?
merkulova 2014/05/29 13:47:53 Oops, sorry
268 } 268 }
269 } 269 }
270 270
271 void ResetScreenHandler::HandleOnLearnMore() { 271 void ResetScreenHandler::HandleOnLearnMore() {
272 if (!help_app_.get()) 272 if (!help_app_.get())
273 help_app_ = new HelpAppLauncher(GetNativeWindow()); 273 help_app_ = new HelpAppLauncher(GetNativeWindow());
274 help_app_->ShowHelpTopic(HelpAppLauncher::HELP_POWERWASH); 274 help_app_->ShowHelpTopic(HelpAppLauncher::HELP_POWERWASH);
275 } 275 }
276 276
277 void ResetScreenHandler::UpdateStatusChanged( 277 void ResetScreenHandler::UpdateStatusChanged(
278 const UpdateEngineClient::Status& status) { 278 const UpdateEngineClient::Status& status) {
279 VLOG(1) << "Update status change to " << status.status; 279 VLOG(1) << "Update status change to " << status.status;
280 if (status.status == UpdateEngineClient::UPDATE_STATUS_ERROR) { 280 if (status.status == UpdateEngineClient::UPDATE_STATUS_ERROR) {
281 // Show error screen. 281 // Show error screen.
282 base::DictionaryValue params; 282 base::DictionaryValue params;
283 params.SetInteger("uiState", kErrorUIStateRollback); 283 params.SetInteger("uiState", kErrorUIStateRollback);
284 ShowScreen(OobeUI::kScreenErrorMessage, &params); 284 ShowScreen(OobeUI::kScreenErrorMessage, &params);
285 } else if (status.status == 285 } else if (status.status ==
286 UpdateEngineClient::UPDATE_STATUS_UPDATED_NEED_REBOOT) { 286 UpdateEngineClient::UPDATE_STATUS_UPDATED_NEED_REBOOT) {
287 DBusThreadManager::Get()->GetPowerManagerClient()->RequestRestart(); 287 DBusThreadManager::Get()->GetPowerManagerClient()->RequestRestart();
288 } 288 }
289 } 289 }
290 290
291 } // namespace chromeos 291 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/resources/chromeos/login/oobe_screen_reset.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698