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 562 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
573 void WizardController::InitiateOOBEUpdate() { | 573 void WizardController::InitiateOOBEUpdate() { |
574 GetUpdateScreen()->StartUpdate(); | 574 GetUpdateScreen()->StartUpdate(); |
575 SetCurrentScreenSmooth(GetUpdateScreen(), true); | 575 SetCurrentScreenSmooth(GetUpdateScreen(), true); |
576 } | 576 } |
577 | 577 |
578 /////////////////////////////////////////////////////////////////////////////// | 578 /////////////////////////////////////////////////////////////////////////////// |
579 // WizardController, private: | 579 // WizardController, private: |
580 | 580 |
581 views::Widget* WizardController::CreateScreenWindow( | 581 views::Widget* WizardController::CreateScreenWindow( |
582 const gfx::Rect& bounds, bool initial_show) { | 582 const gfx::Rect& bounds, bool initial_show) { |
583 widget_ = views::Widget::CreateWidget(); | 583 widget_ = new views::Widget; |
584 views::Widget::InitParams widget_params( | 584 views::Widget::InitParams widget_params( |
585 views::Widget::InitParams::TYPE_WINDOW); | 585 views::Widget::InitParams::TYPE_WINDOW); |
586 // Window transparency makes background flicker through controls that | 586 // Window transparency makes background flicker through controls that |
587 // are constantly updating its contents (like image view with video | 587 // are constantly updating its contents (like image view with video |
588 // stream). Hence enabling double buffer. | 588 // stream). Hence enabling double buffer. |
589 widget_params.double_buffer = true; | 589 widget_params.double_buffer = true; |
590 widget_params.transparent = true; | 590 widget_params.transparent = true; |
591 widget_params.bounds = bounds; | 591 widget_params.bounds = bounds; |
592 widget_->Init(widget_params); | 592 widget_->Init(widget_params); |
593 std::vector<int> params; | 593 std::vector<int> params; |
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
872 return contents_; | 872 return contents_; |
873 } | 873 } |
874 | 874 |
875 chromeos::ScreenObserver* WizardController::GetObserver(WizardScreen* screen) { | 875 chromeos::ScreenObserver* WizardController::GetObserver(WizardScreen* screen) { |
876 return observer_ ? observer_ : this; | 876 return observer_ ? observer_ : this; |
877 } | 877 } |
878 | 878 |
879 void WizardController::SetZeroDelays() { | 879 void WizardController::SetZeroDelays() { |
880 kShowDelayMs = 0; | 880 kShowDelayMs = 0; |
881 } | 881 } |
OLD | NEW |