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

Unified Diff: chrome/browser/automation/testing_automation_provider_chromeos.cc

Issue 10821031: [cros] pyauto.CancelOOBEUpdate always returns a non-empty dict with 'next_screen'. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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/automation/testing_automation_provider.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/automation/testing_automation_provider_chromeos.cc
diff --git a/chrome/browser/automation/testing_automation_provider_chromeos.cc b/chrome/browser/automation/testing_automation_provider_chromeos.cc
index 000677fc80e57fb1a11be389e342e0de3872166a..926170b0fb663d37413baef4c8eccac150070d34 100644
--- a/chrome/browser/automation/testing_automation_provider_chromeos.cc
+++ b/chrome/browser/automation/testing_automation_provider_chromeos.cc
@@ -284,7 +284,11 @@ void TestingAutomationProvider::CancelOOBEUpdate(DictionaryValue* args,
IPC::Message* reply_message) {
WizardController* wizard_controller = WizardController::default_controller();
if (wizard_controller && wizard_controller->IsOobeCompleted()) {
- AutomationJSONReply(this, reply_message).SendSuccess(NULL);
+ // Update already finished.
+ scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
+ return_value->SetString("next_screen",
+ WizardController::kLoginScreenName);
+ AutomationJSONReply(this, reply_message).SendSuccess(return_value.get());
return;
}
if (!wizard_controller || wizard_controller->current_screen()->GetName() !=
« no previous file with comments | « chrome/browser/automation/testing_automation_provider.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698