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 13 matching lines...) Expand all Loading... | |
24 #include "chrome/browser/chromeos/login/default_user_images.h" | 24 #include "chrome/browser/chromeos/login/default_user_images.h" |
25 #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen. h" | 25 #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen. h" |
26 #include "chrome/browser/chromeos/login/existing_user_controller.h" | 26 #include "chrome/browser/chromeos/login/existing_user_controller.h" |
27 #include "chrome/browser/chromeos/login/login_display.h" | 27 #include "chrome/browser/chromeos/login/login_display.h" |
28 #include "chrome/browser/chromeos/login/login_display_host.h" | 28 #include "chrome/browser/chromeos/login/login_display_host.h" |
29 #include "chrome/browser/chromeos/login/screen_locker.h" | 29 #include "chrome/browser/chromeos/login/screen_locker.h" |
30 #include "chrome/browser/chromeos/login/screens/eula_screen.h" | 30 #include "chrome/browser/chromeos/login/screens/eula_screen.h" |
31 #include "chrome/browser/chromeos/login/screens/network_screen.h" | 31 #include "chrome/browser/chromeos/login/screens/network_screen.h" |
32 #include "chrome/browser/chromeos/login/screens/update_screen.h" | 32 #include "chrome/browser/chromeos/login/screens/update_screen.h" |
33 #include "chrome/browser/chromeos/login/screens/user_image_screen.h" | 33 #include "chrome/browser/chromeos/login/screens/user_image_screen.h" |
34 #include "chrome/browser/chromeos/login/startup_utils.h" | |
34 #include "chrome/browser/chromeos/login/webui_login_display.h" | 35 #include "chrome/browser/chromeos/login/webui_login_display.h" |
35 #include "chrome/browser/chromeos/login/webui_login_display_host.h" | 36 #include "chrome/browser/chromeos/login/webui_login_display_host.h" |
36 #include "chrome/browser/chromeos/login/wizard_controller.h" | 37 #include "chrome/browser/chromeos/login/wizard_controller.h" |
37 #include "chrome/browser/chromeos/proxy_config_service_impl.h" | 38 #include "chrome/browser/chromeos/proxy_config_service_impl.h" |
38 #include "chrome/browser/chromeos/proxy_cros_settings_parser.h" | 39 #include "chrome/browser/chromeos/proxy_cros_settings_parser.h" |
39 #include "chrome/browser/chromeos/settings/cros_settings.h" | 40 #include "chrome/browser/chromeos/settings/cros_settings.h" |
40 #include "chrome/browser/chromeos/settings/cros_settings_names.h" | 41 #include "chrome/browser/chromeos/settings/cros_settings_names.h" |
41 #include "chrome/browser/chromeos/system/timezone_settings.h" | 42 #include "chrome/browser/chromeos/system/timezone_settings.h" |
42 #include "chrome/browser/ui/browser.h" | 43 #include "chrome/browser/ui/browser.h" |
43 #include "chrome/browser/ui/browser_window.h" | 44 #include "chrome/browser/ui/browser_window.h" |
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
220 "EULA screen not active."); | 221 "EULA screen not active."); |
221 return; | 222 return; |
222 } | 223 } |
223 // Observer will delete itself. | 224 // Observer will delete itself. |
224 new WizardControllerObserver(wizard_controller, this, reply_message); | 225 new WizardControllerObserver(wizard_controller, this, reply_message); |
225 wizard_controller->GetEulaScreen()->OnExit(accepted, usage_stats_reporting); | 226 wizard_controller->GetEulaScreen()->OnExit(accepted, usage_stats_reporting); |
226 } | 227 } |
227 | 228 |
228 void TestingAutomationProvider::CancelOOBEUpdate(DictionaryValue* args, | 229 void TestingAutomationProvider::CancelOOBEUpdate(DictionaryValue* args, |
229 IPC::Message* reply_message) { | 230 IPC::Message* reply_message) { |
230 WizardController* wizard_controller = WizardController::default_controller(); | 231 WizardController* wizard_controller = WizardController::default_controller(); |
Nikita (slow)
2013/04/19 14:37:56
nit: Move below.
Denis Kuznetsov (DE-MUC)
2013/04/19 14:49:04
Done.
| |
231 if (wizard_controller && wizard_controller->IsOobeCompleted()) { | 232 if (wizard_controller && chromeos::StartupUtils::IsOobeCompleted()) { |
Nikita (slow)
2013/04/19 14:37:56
nit: Drop w_c.
Denis Kuznetsov (DE-MUC)
2013/04/19 14:49:04
Done.
| |
232 // Update already finished. | 233 // Update already finished. |
233 scoped_ptr<DictionaryValue> return_value(new DictionaryValue); | 234 scoped_ptr<DictionaryValue> return_value(new DictionaryValue); |
234 return_value->SetString("next_screen", | 235 return_value->SetString("next_screen", |
235 WizardController::kLoginScreenName); | 236 WizardController::kLoginScreenName); |
236 AutomationJSONReply(this, reply_message).SendSuccess(return_value.get()); | 237 AutomationJSONReply(this, reply_message).SendSuccess(return_value.get()); |
237 return; | 238 return; |
238 } | 239 } |
239 if (!wizard_controller || wizard_controller->current_screen()->GetName() != | 240 if (!wizard_controller || wizard_controller->current_screen()->GetName() != |
240 WizardController::kUpdateScreenName) { | 241 WizardController::kUpdateScreenName) { |
241 AutomationJSONReply(this, reply_message).SendError( | 242 AutomationJSONReply(this, reply_message).SendError( |
(...skipping 1098 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1340 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()-> | 1341 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()-> |
1341 AddObserver(power_manager_observer_); | 1342 AddObserver(power_manager_observer_); |
1342 } | 1343 } |
1343 | 1344 |
1344 void TestingAutomationProvider::RemoveChromeosObservers() { | 1345 void TestingAutomationProvider::RemoveChromeosObservers() { |
1345 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()-> | 1346 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()-> |
1346 RemoveObserver(power_manager_observer_); | 1347 RemoveObserver(power_manager_observer_); |
1347 delete power_manager_observer_; | 1348 delete power_manager_observer_; |
1348 power_manager_observer_ = NULL; | 1349 power_manager_observer_ = NULL; |
1349 } | 1350 } |
OLD | NEW |