OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/ui/login_display_host_impl.h" | 5 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "ash/audio/sounds.h" | 9 #include "ash/audio/sounds.h" |
10 #include "ash/desktop_background/desktop_background_controller.h" | 10 #include "ash/desktop_background/desktop_background_controller.h" |
(...skipping 604 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
615 | 615 |
616 if (!login_window_) { | 616 if (!login_window_) { |
617 TRACE_EVENT_ASYNC_BEGIN0("ui", "ShowLoginWebUI", kShowLoginWebUIid); | 617 TRACE_EVENT_ASYNC_BEGIN0("ui", "ShowLoginWebUI", kShowLoginWebUIid); |
618 TRACE_EVENT_ASYNC_STEP_INTO0( | 618 TRACE_EVENT_ASYNC_STEP_INTO0( |
619 "ui", "ShowLoginWebUI", kShowLoginWebUIid, "StartSignInScreen"); | 619 "ui", "ShowLoginWebUI", kShowLoginWebUIid, "StartSignInScreen"); |
620 BootTimesLoader::Get()->RecordCurrentStats("login-start-signin-screen"); | 620 BootTimesLoader::Get()->RecordCurrentStats("login-start-signin-screen"); |
621 LoadURL(GURL(kLoginURL)); | 621 LoadURL(GURL(kLoginURL)); |
622 } | 622 } |
623 | 623 |
624 DVLOG(1) << "Starting sign in screen"; | 624 DVLOG(1) << "Starting sign in screen"; |
625 const chromeos::UserList& users = chromeos::UserManager::Get()->GetUsers(); | 625 const user_manager::UserList& users = |
| 626 chromeos::UserManager::Get()->GetUsers(); |
626 | 627 |
627 // Fix for users who updated device and thus never passed register screen. | 628 // Fix for users who updated device and thus never passed register screen. |
628 // If we already have users, we assume that it is not a second part of | 629 // If we already have users, we assume that it is not a second part of |
629 // OOBE. See http://crosbug.com/6289 | 630 // OOBE. See http://crosbug.com/6289 |
630 if (!StartupUtils::IsDeviceRegistered() && !users.empty()) { | 631 if (!StartupUtils::IsDeviceRegistered() && !users.empty()) { |
631 VLOG(1) << "Mark device registered because there are remembered users: " | 632 VLOG(1) << "Mark device registered because there are remembered users: " |
632 << users.size(); | 633 << users.size(); |
633 StartupUtils::MarkDeviceRegistered(base::Closure()); | 634 StartupUtils::MarkDeviceRegistered(base::Closure()); |
634 } | 635 } |
635 | 636 |
(...skipping 637 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1273 scoped_ptr<locale_util::SwitchLanguageCallback> callback( | 1274 scoped_ptr<locale_util::SwitchLanguageCallback> callback( |
1274 new locale_util::SwitchLanguageCallback( | 1275 new locale_util::SwitchLanguageCallback( |
1275 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass())))); | 1276 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass())))); |
1276 | 1277 |
1277 // Load locale keyboards here. Hardware layout would be automatically enabled. | 1278 // Load locale keyboards here. Hardware layout would be automatically enabled. |
1278 locale_util::SwitchLanguage( | 1279 locale_util::SwitchLanguage( |
1279 locale, true, true /* login_layouts_only */, callback.Pass()); | 1280 locale, true, true /* login_layouts_only */, callback.Pass()); |
1280 } | 1281 } |
1281 | 1282 |
1282 } // namespace chromeos | 1283 } // namespace chromeos |
OLD | NEW |