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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/screens/user_image_screen.h » ('j') | 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/automation/testing_automation_provider.h" 5 #include "chrome/browser/automation/testing_automation_provider.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_delegate.h" 8 #include "ash/shell_delegate.h"
9 #include "ash/system/tray/system_tray_delegate.h" 9 #include "ash/system/tray/system_tray_delegate.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 372 matching lines...) Expand 10 before | Expand all | Expand 10 after
383 AutomationJSONReply(this, reply_message).SendError( 383 AutomationJSONReply(this, reply_message).SendError(
384 "User image screen not active."); 384 "User image screen not active.");
385 return; 385 return;
386 } 386 }
387 chromeos::UserImageScreen* image_screen = 387 chromeos::UserImageScreen* image_screen =
388 wizard_controller->GetUserImageScreen(); 388 wizard_controller->GetUserImageScreen();
389 // Observer will delete itself unless error is returned. 389 // Observer will delete itself unless error is returned.
390 WizardControllerObserver* observer = 390 WizardControllerObserver* observer =
391 new WizardControllerObserver(wizard_controller, this, reply_message); 391 new WizardControllerObserver(wizard_controller, this, reply_message);
392 if (image_type == "profile") { 392 if (image_type == "profile") {
393 image_screen->OnProfileImageSelected(); 393 image_screen->OnImageSelected("", image_type);
394 image_screen->OnImageAccepted();
394 } else if (image_type.empty() && image_number >= 0 && 395 } else if (image_type.empty() && image_number >= 0 &&
395 image_number < chromeos::kDefaultImagesCount) { 396 image_number < chromeos::kDefaultImagesCount) {
396 image_screen->OnDefaultImageSelected(image_number); 397 image_screen->OnImageSelected(
398 chromeos::GetDefaultImageUrl(image_number), image_type);
399 image_screen->OnImageAccepted();
397 } else { 400 } else {
398 AutomationJSONReply(this, reply_message).SendError( 401 AutomationJSONReply(this, reply_message).SendError(
399 "Invalid or missing args."); 402 "Invalid or missing args.");
400 delete observer; 403 delete observer;
401 return; 404 return;
402 } 405 }
403 } 406 }
404 407
405 void TestingAutomationProvider::SkipToLogin(DictionaryValue* args, 408 void TestingAutomationProvider::SkipToLogin(DictionaryValue* args,
406 IPC::Message* reply_message) { 409 IPC::Message* reply_message) {
(...skipping 930 matching lines...) Expand 10 before | Expand all | Expand 10 after
1337 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()-> 1340 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
1338 AddObserver(power_manager_observer_); 1341 AddObserver(power_manager_observer_);
1339 } 1342 }
1340 1343
1341 void TestingAutomationProvider::RemoveChromeosObservers() { 1344 void TestingAutomationProvider::RemoveChromeosObservers() {
1342 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()-> 1345 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
1343 RemoveObserver(power_manager_observer_); 1346 RemoveObserver(power_manager_observer_);
1344 delete power_manager_observer_; 1347 delete power_manager_observer_;
1345 power_manager_observer_ = NULL; 1348 power_manager_observer_ = NULL;
1346 } 1349 }
OLDNEW
« 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