| 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/chromeos/login/wizard_controller.h" | 5 #include "chrome/browser/chromeos/login/wizard_controller.h" |
| 6 | 6 |
| 7 #include <signal.h> | 7 #include <signal.h> |
| 8 #include <stdlib.h> | 8 #include <stdlib.h> |
| 9 #include <sys/types.h> | 9 #include <sys/types.h> |
| 10 | 10 |
| (...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 301 chromeos::UpdateScreen* result = | 301 chromeos::UpdateScreen* result = |
| 302 new chromeos::UpdateScreen(this, | 302 new chromeos::UpdateScreen(this, |
| 303 oobe_display_->GetUpdateScreenActor(), | 303 oobe_display_->GetUpdateScreenActor(), |
| 304 remora_controller_.get()); | 304 remora_controller_.get()); |
| 305 result->SetRebootCheckDelay(kWaitForRebootTimeSec); | 305 result->SetRebootCheckDelay(kWaitForRebootTimeSec); |
| 306 return result; | 306 return result; |
| 307 } else if (screen_name == kUserImageScreenName) { | 307 } else if (screen_name == kUserImageScreenName) { |
| 308 return new chromeos::UserImageScreen( | 308 return new chromeos::UserImageScreen( |
| 309 this, oobe_display_->GetUserImageScreenActor()); | 309 this, oobe_display_->GetUserImageScreenActor()); |
| 310 } else if (screen_name == kEulaScreenName) { | 310 } else if (screen_name == kEulaScreenName) { |
| 311 return new chromeos::EulaScreen( | 311 return new chromeos::EulaScreen(this, this, oobe_display_->GetEulaView()); |
| 312 this, this, oobe_display_->GetEulaScreenActor()); | |
| 313 } else if (screen_name == kEnrollmentScreenName) { | 312 } else if (screen_name == kEnrollmentScreenName) { |
| 314 return new chromeos::EnrollmentScreen( | 313 return new chromeos::EnrollmentScreen( |
| 315 this, oobe_display_->GetEnrollmentScreenActor()); | 314 this, oobe_display_->GetEnrollmentScreenActor()); |
| 316 } else if (screen_name == kResetScreenName) { | 315 } else if (screen_name == kResetScreenName) { |
| 317 return new chromeos::ResetScreen(this, | 316 return new chromeos::ResetScreen(this, |
| 318 oobe_display_->GetResetScreenActor()); | 317 oobe_display_->GetResetScreenActor()); |
| 319 } else if (screen_name == kEnableDebuggingScreenName) { | 318 } else if (screen_name == kEnableDebuggingScreenName) { |
| 320 return new chromeos::EnableDebuggingScreen( | 319 return new chromeos::EnableDebuggingScreen( |
| 321 this, | 320 this, |
| 322 oobe_display_->GetEnableDebuggingScreenActor()); | 321 oobe_display_->GetEnableDebuggingScreenActor()); |
| (...skipping 1035 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1358 scoped_ptr<pairing_chromeos::HostPairingController> remora_controller) { | 1357 scoped_ptr<pairing_chromeos::HostPairingController> remora_controller) { |
| 1359 VLOG(1) << "OnSharkConnected"; | 1358 VLOG(1) << "OnSharkConnected"; |
| 1360 remora_controller_ = remora_controller.Pass(); | 1359 remora_controller_ = remora_controller.Pass(); |
| 1361 base::MessageLoop::current()->DeleteSoon( | 1360 base::MessageLoop::current()->DeleteSoon( |
| 1362 FROM_HERE, shark_connection_listener_.release()); | 1361 FROM_HERE, shark_connection_listener_.release()); |
| 1363 shark_controller_detected_ = true; | 1362 shark_controller_detected_ = true; |
| 1364 ShowHostPairingScreen(); | 1363 ShowHostPairingScreen(); |
| 1365 } | 1364 } |
| 1366 | 1365 |
| 1367 } // namespace chromeos | 1366 } // namespace chromeos |
| OLD | NEW |