| OLD | NEW |
| 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 Loading... |
| 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 } else if (image_type.empty() && image_number >= 0 && | 394 } else if (image_type.empty() && image_number >= 0 && |
| 395 image_number < chromeos::kDefaultImagesCount) { | 395 image_number < chromeos::kDefaultImagesCount) { |
| 396 image_screen->OnDefaultImageSelected(image_number); | 396 image_screen->OnImageSelected( |
| 397 chromeos::GetDefaultImageUrl(image_number), image_type); |
| 397 } else { | 398 } else { |
| 398 AutomationJSONReply(this, reply_message).SendError( | 399 AutomationJSONReply(this, reply_message).SendError( |
| 399 "Invalid or missing args."); | 400 "Invalid or missing args."); |
| 400 delete observer; | 401 delete observer; |
| 401 return; | 402 return; |
| 402 } | 403 } |
| 403 } | 404 } |
| 404 | 405 |
| 405 void TestingAutomationProvider::SkipToLogin(DictionaryValue* args, | 406 void TestingAutomationProvider::SkipToLogin(DictionaryValue* args, |
| 406 IPC::Message* reply_message) { | 407 IPC::Message* reply_message) { |
| (...skipping 930 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1337 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()-> | 1338 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()-> |
| 1338 AddObserver(power_manager_observer_); | 1339 AddObserver(power_manager_observer_); |
| 1339 } | 1340 } |
| 1340 | 1341 |
| 1341 void TestingAutomationProvider::RemoveChromeosObservers() { | 1342 void TestingAutomationProvider::RemoveChromeosObservers() { |
| 1342 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()-> | 1343 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()-> |
| 1343 RemoveObserver(power_manager_observer_); | 1344 RemoveObserver(power_manager_observer_); |
| 1344 delete power_manager_observer_; | 1345 delete power_manager_observer_; |
| 1345 power_manager_observer_ = NULL; | 1346 power_manager_observer_ = NULL; |
| 1346 } | 1347 } |
| OLD | NEW |