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

Unified Diff: chrome/browser/chromeos/login/ui/login_display_host_impl.cc

Issue 1980833002: Reduce Error Message in LoginDisplayHostImpl::ShutdownDisplayHost (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/ui/login_display_host_impl.cc
diff --git a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
index 148bde68a68ee28e48a5763031bb91e8e9a3153d..646c2d24c6efe4477c4eddc4f32ef536aae35dd8 100644
--- a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
+++ b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
@@ -1014,13 +1014,14 @@ void LoginDisplayHostImpl::ShutdownDisplayHost(bool post_quit_task) {
base::MessageLoop::current()->PostTask(FROM_HERE, completion_callback_);
if (ash::Shell::HasInstance() &&
- finalize_animation_type_ == ANIMATION_ADD_USER &&
- !chrome::IsRunningInMash()) {
- ash::Shell::GetInstance()
- ->desktop_background_controller()
- ->MoveDesktopToUnlockedContainer();
- } else {
- NOTIMPLEMENTED();
+ finalize_animation_type_ == ANIMATION_ADD_USER) {
+ if (!chrome::IsRunningInMash()) {
+ ash::Shell::GetInstance()
+ ->desktop_background_controller()
+ ->MoveDesktopToUnlockedContainer();
+ } else {
+ NOTIMPLEMENTED();
+ }
}
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698