OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 287 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
298 | 298 |
299 bool oobe_complete = IsOobeCompleted(); | 299 bool oobe_complete = IsOobeCompleted(); |
300 if (!oobe_complete || first_screen_name == kOutOfBoxScreenName) { | 300 if (!oobe_complete || first_screen_name == kOutOfBoxScreenName) { |
301 is_out_of_box_ = true; | 301 is_out_of_box_ = true; |
302 } | 302 } |
303 | 303 |
304 ShowFirstScreen(first_screen_name); | 304 ShowFirstScreen(first_screen_name); |
305 } | 305 } |
306 | 306 |
307 void WizardController::Show() { | 307 void WizardController::Show() { |
308 // In tests we might startup without initial screen | 308 // In tests and in case of --login-screen=login there is no screen to show. |
309 // so widget_ hasn't been created yet. | 309 if (first_screen_name_ != kTestNoScreenName && |
310 if (first_screen_name_ != kTestNoScreenName) | 310 first_screen_name_ != kLoginScreenName) { |
311 DCHECK(widget_); | 311 DCHECK(widget_); |
| 312 } |
| 313 |
312 if (widget_) | 314 if (widget_) |
313 widget_->Show(); | 315 widget_->Show(); |
314 } | 316 } |
315 | 317 |
316 void WizardController::ShowBackground(const gfx::Rect& bounds) { | 318 void WizardController::ShowBackground(const gfx::Rect& bounds) { |
317 DCHECK(!background_widget_); | 319 DCHECK(!background_widget_); |
318 background_widget_ = | 320 background_widget_ = |
319 chromeos::BackgroundView::CreateWindowContainingView(bounds, | 321 chromeos::BackgroundView::CreateWindowContainingView(bounds, |
320 GURL(), | 322 GURL(), |
321 &background_view_); | 323 &background_view_); |
(...skipping 652 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
974 // user has changed to during OOBE. | 976 // user has changed to during OOBE. |
975 if (!timezone_name.empty()) { | 977 if (!timezone_name.empty()) { |
976 icu::TimeZone* timezone = icu::TimeZone::createTimeZone( | 978 icu::TimeZone* timezone = icu::TimeZone::createTimeZone( |
977 icu::UnicodeString::fromUTF8(timezone_name)); | 979 icu::UnicodeString::fromUTF8(timezone_name)); |
978 chromeos::CrosLibrary::Get()->GetSystemLibrary()->SetTimezone(timezone); | 980 chromeos::CrosLibrary::Get()->GetSystemLibrary()->SetTimezone(timezone); |
979 } | 981 } |
980 } | 982 } |
981 } | 983 } |
982 | 984 |
983 } // namespace browser | 985 } // namespace browser |
OLD | NEW |