| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/base_login_display_host.h" | 5 #include "chrome/browser/chromeos/login/base_login_display_host.h" |
| 6 | 6 |
| 7 #include "ash/desktop_background/desktop_background_controller.h" | 7 #include "ash/desktop_background/desktop_background_controller.h" |
| 8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
| 9 #include "ash/shell_window_ids.h" | 9 #include "ash/shell_window_ids.h" |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 160 | 160 |
| 161 //////////////////////////////////////////////////////////////////////////////// | 161 //////////////////////////////////////////////////////////////////////////////// |
| 162 // BaseLoginDisplayHost, LoginDisplayHost implementation: | 162 // BaseLoginDisplayHost, LoginDisplayHost implementation: |
| 163 | 163 |
| 164 void BaseLoginDisplayHost::BeforeSessionStart() { | 164 void BaseLoginDisplayHost::BeforeSessionStart() { |
| 165 session_starting_ = true; | 165 session_starting_ = true; |
| 166 } | 166 } |
| 167 | 167 |
| 168 void BaseLoginDisplayHost::OnSessionStart() { | 168 void BaseLoginDisplayHost::OnSessionStart() { |
| 169 DVLOG(1) << "Session starting"; | 169 DVLOG(1) << "Session starting"; |
| 170 if (chromeos::UserManager::Get()->IsCurrentUserNew()) { | 170 ash::Shell::GetInstance()-> |
| 171 ash::Shell::GetInstance()-> | 171 desktop_background_controller()->MoveDesktopToUnlockedContainer(); |
| 172 desktop_background_controller()->MoveDesktopToUnlockedContainer(); | |
| 173 } | |
| 174 if (wizard_controller_.get()) | 172 if (wizard_controller_.get()) |
| 175 wizard_controller_->OnSessionStart(); | 173 wizard_controller_->OnSessionStart(); |
| 176 // Display host is deleted once animation is completed | 174 // Display host is deleted once animation is completed |
| 177 // since sign in screen widget has to stay alive. | 175 // since sign in screen widget has to stay alive. |
| 178 StartAnimation(); | 176 StartAnimation(); |
| 179 ShutdownDisplayHost(false); | 177 ShutdownDisplayHost(false); |
| 180 } | 178 } |
| 181 | 179 |
| 182 void BaseLoginDisplayHost::OnCompleteLogin() { | 180 void BaseLoginDisplayHost::OnCompleteLogin() { |
| 183 // Cancelling the |auto_enrollment_client_| now allows it to determine whether | 181 // Cancelling the |auto_enrollment_client_| now allows it to determine whether |
| (...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 508 VLOG(1) << "Initial time zone: " << timezone_name; | 506 VLOG(1) << "Initial time zone: " << timezone_name; |
| 509 // Apply locale customizations only once to preserve whatever locale | 507 // Apply locale customizations only once to preserve whatever locale |
| 510 // user has changed to during OOBE. | 508 // user has changed to during OOBE. |
| 511 if (!timezone_name.empty()) { | 509 if (!timezone_name.empty()) { |
| 512 chromeos::system::TimezoneSettings::GetInstance()->SetTimezoneFromID( | 510 chromeos::system::TimezoneSettings::GetInstance()->SetTimezoneFromID( |
| 513 UTF8ToUTF16(timezone_name)); | 511 UTF8ToUTF16(timezone_name)); |
| 514 } | 512 } |
| 515 } | 513 } |
| 516 | 514 |
| 517 } // namespace chromeos | 515 } // namespace chromeos |
| OLD | NEW |