| 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/login_display_host_impl.h" | 5 #include "chrome/browser/chromeos/login/login_display_host_impl.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "ash/desktop_background/desktop_background_controller.h" | 9 #include "ash/desktop_background/desktop_background_controller.h" |
| 10 #include "ash/desktop_background/user_wallpaper_delegate.h" | 10 #include "ash/desktop_background/user_wallpaper_delegate.h" |
| (...skipping 649 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 660 // default and background layer because there is nothing behind it. | 660 // default and background layer because there is nothing behind it. |
| 661 return; | 661 return; |
| 662 } | 662 } |
| 663 | 663 |
| 664 if (!CommandLine::ForCurrentProcess()->HasSwitch( | 664 if (!CommandLine::ForCurrentProcess()->HasSwitch( |
| 665 switches::kDisableLoginAnimations)) | 665 switches::kDisableLoginAnimations)) |
| 666 ash::Shell::GetInstance()->DoInitialWorkspaceAnimation(); | 666 ash::Shell::GetInstance()->DoInitialWorkspaceAnimation(); |
| 667 } | 667 } |
| 668 | 668 |
| 669 void LoginDisplayHostImpl::OnOwnershipStatusCheckDone( | 669 void LoginDisplayHostImpl::OnOwnershipStatusCheckDone( |
| 670 DeviceSettingsService::OwnershipStatus status, | 670 DeviceSettingsService::OwnershipStatus status) { |
| 671 bool current_user_is_owner) { | |
| 672 if (status != DeviceSettingsService::OWNERSHIP_NONE) { | 671 if (status != DeviceSettingsService::OWNERSHIP_NONE) { |
| 673 // The device is already owned. No need for auto-enrollment checks. | 672 // The device is already owned. No need for auto-enrollment checks. |
| 674 VLOG(1) << "CheckForAutoEnrollment: device already owned"; | 673 VLOG(1) << "CheckForAutoEnrollment: device already owned"; |
| 675 return; | 674 return; |
| 676 } | 675 } |
| 677 | 676 |
| 678 // Kick off the auto-enrollment client. | 677 // Kick off the auto-enrollment client. |
| 679 if (auto_enrollment_client_.get()) { | 678 if (auto_enrollment_client_.get()) { |
| 680 // They client might have been started after the EULA screen, but we made | 679 // They client might have been started after the EULA screen, but we made |
| 681 // it to the login screen before it finished. In that case let the current | 680 // it to the login screen before it finished. In that case let the current |
| (...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 988 VLOG(1) << "Initial time zone: " << timezone_name; | 987 VLOG(1) << "Initial time zone: " << timezone_name; |
| 989 // Apply locale customizations only once to preserve whatever locale | 988 // Apply locale customizations only once to preserve whatever locale |
| 990 // user has changed to during OOBE. | 989 // user has changed to during OOBE. |
| 991 if (!timezone_name.empty()) { | 990 if (!timezone_name.empty()) { |
| 992 chromeos::system::TimezoneSettings::GetInstance()->SetTimezoneFromID( | 991 chromeos::system::TimezoneSettings::GetInstance()->SetTimezoneFromID( |
| 993 UTF8ToUTF16(timezone_name)); | 992 UTF8ToUTF16(timezone_name)); |
| 994 } | 993 } |
| 995 } | 994 } |
| 996 | 995 |
| 997 } // namespace chromeos | 996 } // namespace chromeos |
| OLD | NEW |