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

Unified Diff: chrome/browser/chromeos/login/reset_browsertest.cc

Issue 609803002: UI rework for reset options including Rollback. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Strings and views nits. Rollback view is unset on screen cancel. Created 6 years, 2 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/app/chromeos_strings.grdp ('k') | chrome/browser/chromeos/login/ui/webui_login_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/reset_browsertest.cc
diff --git a/chrome/browser/chromeos/login/reset_browsertest.cc b/chrome/browser/chromeos/login/reset_browsertest.cc
index f9c2577377f0113d0096aecf296d1c1d993d8123..84ab1e081e4b334c795ea26c6d0c9078c4210699 100644
--- a/chrome/browser/chromeos/login/reset_browsertest.cc
+++ b/chrome/browser/chromeos/login/reset_browsertest.cc
@@ -75,8 +75,7 @@ class ResetTest : public LoginManagerTest {
}
void InvokeRollbackOption() {
- ASSERT_TRUE(JSExecuted(
- "cr.ui.Oobe.handleAccelerator('show_rollback_on_reset_screen');"));
+ ASSERT_TRUE(JSExecuted("cr.ui.Oobe.handleAccelerator('reset');"));
}
void CloseResetScreen() {
@@ -84,7 +83,7 @@ class ResetTest : public LoginManagerTest {
}
void ClickResetButton() {
- ASSERT_TRUE(JSExecuted("$('reset-button').click();"));
+ ASSERT_TRUE(JSExecuted("$('reset-confirm-commit').click();"));
}
void ClickRestartButton() {
@@ -243,6 +242,7 @@ IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest,
IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest, SuccessOnRollbackRequested) {
update_engine_client_->set_can_rollback_check_result(true);
OobeScreenWaiter(OobeDisplay::SCREEN_OOBE_RESET).Wait();
+ LOG(ERROR) << "1";
InvokeRollbackOption();
ClickToConfirmButton();
ClickResetButton();
« no previous file with comments | « chrome/app/chromeos_strings.grdp ('k') | chrome/browser/chromeos/login/ui/webui_login_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698