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

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

Issue 14063017: Move logic in UserImageScreen from UserImageScreenHandler (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 7 years, 8 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 | « no previous file | chrome/browser/chromeos/login/screens/user_image_screen.h » ('j') | 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 ce7d871d9f406836d8e4eb792834176ac23b1644..b027b5c635286ea69bd453ff9dbfc30d06df4242 100644
--- a/chrome/browser/automation/testing_automation_provider_chromeos.cc
+++ b/chrome/browser/automation/testing_automation_provider_chromeos.cc
@@ -390,10 +390,13 @@ void TestingAutomationProvider::PickUserImage(DictionaryValue* args,
WizardControllerObserver* observer =
new WizardControllerObserver(wizard_controller, this, reply_message);
if (image_type == "profile") {
- image_screen->OnProfileImageSelected();
+ image_screen->OnImageSelected("", image_type);
+ image_screen->OnImageAccepted();
} else if (image_type.empty() && image_number >= 0 &&
image_number < chromeos::kDefaultImagesCount) {
- image_screen->OnDefaultImageSelected(image_number);
+ image_screen->OnImageSelected(
+ chromeos::GetDefaultImageUrl(image_number), image_type);
+ image_screen->OnImageAccepted();
} else {
AutomationJSONReply(this, reply_message).SendError(
"Invalid or missing args.");
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/screens/user_image_screen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698