OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 <gdk/gdk.h> | 7 #include <gdk/gdk.h> |
8 #include <signal.h> | 8 #include <signal.h> |
9 #include <sys/types.h> | 9 #include <sys/types.h> |
10 | 10 |
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
233 SetStatusAreaVisible(false); | 233 SetStatusAreaVisible(false); |
234 SetCurrentScreen(GetNetworkScreen()); | 234 SetCurrentScreen(GetNetworkScreen()); |
235 host_->SetOobeProgress(chromeos::BackgroundView::SELECT_NETWORK); | 235 host_->SetOobeProgress(chromeos::BackgroundView::SELECT_NETWORK); |
236 } | 236 } |
237 | 237 |
238 void WizardController::ShowLoginScreen() { | 238 void WizardController::ShowLoginScreen() { |
239 SetStatusAreaVisible(true); | 239 SetStatusAreaVisible(true); |
240 host_->SetOobeProgress(chromeos::BackgroundView::SIGNIN); | 240 host_->SetOobeProgress(chromeos::BackgroundView::SIGNIN); |
241 host_->StartSignInScreen(); | 241 host_->StartSignInScreen(); |
242 smooth_show_timer_.Stop(); | 242 smooth_show_timer_.Stop(); |
243 oobe_display_.reset(NULL); | 243 oobe_display_ = NULL; |
244 } | 244 } |
245 | 245 |
246 void WizardController::ShowUpdateScreen() { | 246 void WizardController::ShowUpdateScreen() { |
247 VLOG(1) << "Showing update screen."; | 247 VLOG(1) << "Showing update screen."; |
248 SetStatusAreaVisible(true); | 248 SetStatusAreaVisible(true); |
249 SetCurrentScreen(GetUpdateScreen()); | 249 SetCurrentScreen(GetUpdateScreen()); |
250 // There is no special step for update. | 250 // There is no special step for update. |
251 #if defined(OFFICIAL_BUILD) | 251 #if defined(OFFICIAL_BUILD) |
252 host_->SetOobeProgress(chromeos::BackgroundView::EULA); | 252 host_->SetOobeProgress(chromeos::BackgroundView::EULA); |
253 #else | 253 #else |
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
449 } | 449 } |
450 | 450 |
451 | 451 |
452 void WizardController::SetCurrentScreen(WizardScreen* new_current) { | 452 void WizardController::SetCurrentScreen(WizardScreen* new_current) { |
453 SetCurrentScreenSmooth(new_current, false); | 453 SetCurrentScreenSmooth(new_current, false); |
454 } | 454 } |
455 | 455 |
456 void WizardController::ShowCurrentScreen() { | 456 void WizardController::ShowCurrentScreen() { |
457 // ShowCurrentScreen may get called by smooth_show_timer_ even after | 457 // ShowCurrentScreen may get called by smooth_show_timer_ even after |
458 // flow has been switched to sign in screen (ExistingUserController). | 458 // flow has been switched to sign in screen (ExistingUserController). |
459 if (!oobe_display_.get()) | 459 if (!oobe_display_) |
460 return; | 460 return; |
461 | 461 |
462 smooth_show_timer_.Stop(); | 462 smooth_show_timer_.Stop(); |
463 | 463 |
464 oobe_display_->ShowScreen(current_screen_); | 464 oobe_display_->ShowScreen(current_screen_); |
465 } | 465 } |
466 | 466 |
467 void WizardController::SetCurrentScreenSmooth(WizardScreen* new_current, | 467 void WizardController::SetCurrentScreenSmooth(WizardScreen* new_current, |
468 bool use_smoothing) { | 468 bool use_smoothing) { |
469 if (current_screen_ == new_current || | 469 if (current_screen_ == new_current || |
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
682 | 682 |
683 bool WizardController::usage_statistics_reporting() const { | 683 bool WizardController::usage_statistics_reporting() const { |
684 return usage_statistics_reporting_; | 684 return usage_statistics_reporting_; |
685 } | 685 } |
686 | 686 |
687 void WizardController::SetZeroDelays() { | 687 void WizardController::SetZeroDelays() { |
688 kShowDelayMs = 0; | 688 kShowDelayMs = 0; |
689 } | 689 } |
690 | 690 |
691 } // namespace chromeos | 691 } // namespace chromeos |
OLD | NEW |