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

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

Issue 2935623003: Merge "cros: Move wallpaper after login screen is gone" (Closed)
Patch Set: Created 3 years, 6 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
OLDNEW
1 // Copyright 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 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/arc_kiosk_controller.h" 5 #include "chrome/browser/chromeos/login/arc_kiosk_controller.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/time/time.h" 8 #include "base/time/time.h"
9 #include "base/timer/timer.h" 9 #include "base/timer/timer.h"
10 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h" 10 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 login_performer_ = base::MakeUnique<ChromeLoginPerformer>(this); 47 login_performer_ = base::MakeUnique<ChromeLoginPerformer>(this);
48 login_performer_->LoginAsArcKioskAccount(account_id); 48 login_performer_->LoginAsArcKioskAccount(account_id);
49 } 49 }
50 50
51 void ArcKioskController::CleanUp() { 51 void ArcKioskController::CleanUp() {
52 splash_wait_timer_.Stop(); 52 splash_wait_timer_.Stop();
53 // Delegate is registered only when |profile_| is set. 53 // Delegate is registered only when |profile_| is set.
54 if (profile_) 54 if (profile_)
55 ArcKioskAppService::Get(profile_)->SetDelegate(nullptr); 55 ArcKioskAppService::Get(profile_)->SetDelegate(nullptr);
56 if (host_) 56 if (host_)
57 host_->Finalize(); 57 host_->Finalize(base::OnceClosure());
58 } 58 }
59 59
60 void ArcKioskController::CloseSplashScreen() { 60 void ArcKioskController::CloseSplashScreen() {
61 if (!launched_) 61 if (!launched_)
62 return; 62 return;
63 CleanUp(); 63 CleanUp();
64 session_manager::SessionManager::Get()->SessionStarted(); 64 session_manager::SessionManager::Get()->SessionStarted();
65 } 65 }
66 66
67 void ArcKioskController::OnAuthFailure(const AuthFailure& error) { 67 void ArcKioskController::OnAuthFailure(const AuthFailure& error) {
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 CloseSplashScreen(); 127 CloseSplashScreen();
128 } 128 }
129 129
130 void ArcKioskController::OnCancelArcKioskLaunch() { 130 void ArcKioskController::OnCancelArcKioskLaunch() {
131 KioskAppLaunchError::Save(KioskAppLaunchError::USER_CANCEL); 131 KioskAppLaunchError::Save(KioskAppLaunchError::USER_CANCEL);
132 CleanUp(); 132 CleanUp();
133 chrome::AttemptUserExit(); 133 chrome::AttemptUserExit();
134 } 134 }
135 135
136 } // namespace chromeos 136 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/app_launch_controller.cc ('k') | chrome/browser/chromeos/login/demo_mode/demo_app_launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698