Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2016)

Side by Side Diff: chrome/browser/chromeos/login/login_display_host_impl.cc

Issue 23532034: Postpone loading about:flags ui until the certificates have been loaded (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 663 matching lines...) Expand 10 before | Expand all | Expand 10 after
674 // default and background layer because there is nothing behind it. 674 // default and background layer because there is nothing behind it.
675 return; 675 return;
676 } 676 }
677 677
678 if (!CommandLine::ForCurrentProcess()->HasSwitch( 678 if (!CommandLine::ForCurrentProcess()->HasSwitch(
679 switches::kDisableLoginAnimations)) 679 switches::kDisableLoginAnimations))
680 ash::Shell::GetInstance()->DoInitialWorkspaceAnimation(); 680 ash::Shell::GetInstance()->DoInitialWorkspaceAnimation();
681 } 681 }
682 682
683 void LoginDisplayHostImpl::OnOwnershipStatusCheckDone( 683 void LoginDisplayHostImpl::OnOwnershipStatusCheckDone(
684 DeviceSettingsService::OwnershipStatus status, 684 DeviceSettingsService::OwnershipStatus status) {
685 bool current_user_is_owner) {
686 if (status != DeviceSettingsService::OWNERSHIP_NONE) { 685 if (status != DeviceSettingsService::OWNERSHIP_NONE) {
687 // The device is already owned. No need for auto-enrollment checks. 686 // The device is already owned. No need for auto-enrollment checks.
688 VLOG(1) << "CheckForAutoEnrollment: device already owned"; 687 VLOG(1) << "CheckForAutoEnrollment: device already owned";
689 return; 688 return;
690 } 689 }
691 690
692 // Kick off the auto-enrollment client. 691 // Kick off the auto-enrollment client.
693 if (auto_enrollment_client_.get()) { 692 if (auto_enrollment_client_.get()) {
694 // They client might have been started after the EULA screen, but we made 693 // They client might have been started after the EULA screen, but we made
695 // it to the login screen before it finished. In that case let the current 694 // it to the login screen before it finished. In that case let the current
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
978 VLOG(1) << "Initial time zone: " << timezone_name; 977 VLOG(1) << "Initial time zone: " << timezone_name;
979 // Apply locale customizations only once to preserve whatever locale 978 // Apply locale customizations only once to preserve whatever locale
980 // user has changed to during OOBE. 979 // user has changed to during OOBE.
981 if (!timezone_name.empty()) { 980 if (!timezone_name.empty()) {
982 chromeos::system::TimezoneSettings::GetInstance()->SetTimezoneFromID( 981 chromeos::system::TimezoneSettings::GetInstance()->SetTimezoneFromID(
983 UTF8ToUTF16(timezone_name)); 982 UTF8ToUTF16(timezone_name));
984 } 983 }
985 } 984 }
986 985
987 } // namespace chromeos 986 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/login_display_host_impl.h ('k') | chrome/browser/chromeos/login/parallel_authenticator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698