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 484 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
495 | 495 |
496 smooth_show_timer_.Stop(); | 496 smooth_show_timer_.Stop(); |
497 | 497 |
498 if (current_screen_) | 498 if (current_screen_) |
499 oobe_display_->HideScreen(current_screen_); | 499 oobe_display_->HideScreen(current_screen_); |
500 | 500 |
501 current_screen_ = new_current; | 501 current_screen_ = new_current; |
502 | 502 |
503 if (use_smoothing) { | 503 if (use_smoothing) { |
504 smooth_show_timer_.Start( | 504 smooth_show_timer_.Start( |
505 FROM_HERE, | |
506 base::TimeDelta::FromMilliseconds(kShowDelayMs), | 505 base::TimeDelta::FromMilliseconds(kShowDelayMs), |
507 this, | 506 this, |
508 &WizardController::ShowCurrentScreen); | 507 &WizardController::ShowCurrentScreen); |
509 } else { | 508 } else { |
510 ShowCurrentScreen(); | 509 ShowCurrentScreen(); |
511 } | 510 } |
512 } | 511 } |
513 | 512 |
514 void WizardController::SetStatusAreaVisible(bool visible) { | 513 void WizardController::SetStatusAreaVisible(bool visible) { |
515 host_->SetStatusAreaVisible(visible); | 514 host_->SetStatusAreaVisible(visible); |
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
704 | 703 |
705 bool WizardController::usage_statistics_reporting() const { | 704 bool WizardController::usage_statistics_reporting() const { |
706 return usage_statistics_reporting_; | 705 return usage_statistics_reporting_; |
707 } | 706 } |
708 | 707 |
709 void WizardController::SetZeroDelays() { | 708 void WizardController::SetZeroDelays() { |
710 kShowDelayMs = 0; | 709 kShowDelayMs = 0; |
711 } | 710 } |
712 | 711 |
713 } // namespace chromeos | 712 } // namespace chromeos |
OLD | NEW |