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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/ui/login_display_host_impl.h" 5 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/audio/sounds.h" 10 #include "ash/audio/sounds.h"
(...skipping 996 matching lines...) Expand 10 before | Expand all | Expand 10 after
1007 shutting_down_ = true; 1007 shutting_down_ = true;
1008 registrar_.RemoveAll(); 1008 registrar_.RemoveAll();
1009 base::MessageLoop::current()->DeleteSoon(FROM_HERE, this); 1009 base::MessageLoop::current()->DeleteSoon(FROM_HERE, this);
1010 if (post_quit_task) 1010 if (post_quit_task)
1011 base::MessageLoop::current()->QuitWhenIdle(); 1011 base::MessageLoop::current()->QuitWhenIdle();
1012 1012
1013 if (!completion_callback_.is_null()) 1013 if (!completion_callback_.is_null())
1014 base::MessageLoop::current()->PostTask(FROM_HERE, completion_callback_); 1014 base::MessageLoop::current()->PostTask(FROM_HERE, completion_callback_);
1015 1015
1016 if (ash::Shell::HasInstance() && 1016 if (ash::Shell::HasInstance() &&
1017 finalize_animation_type_ == ANIMATION_ADD_USER && 1017 finalize_animation_type_ == ANIMATION_ADD_USER) {
1018 !chrome::IsRunningInMash()) { 1018 if (!chrome::IsRunningInMash()) {
1019 ash::Shell::GetInstance() 1019 ash::Shell::GetInstance()
1020 ->desktop_background_controller() 1020 ->desktop_background_controller()
1021 ->MoveDesktopToUnlockedContainer(); 1021 ->MoveDesktopToUnlockedContainer();
1022 } else { 1022 } else {
1023 NOTIMPLEMENTED(); 1023 NOTIMPLEMENTED();
1024 }
1024 } 1025 }
1025 } 1026 }
1026 1027
1027 void LoginDisplayHostImpl::ScheduleWorkspaceAnimation() { 1028 void LoginDisplayHostImpl::ScheduleWorkspaceAnimation() {
1028 if (chrome::IsRunningInMash()) { 1029 if (chrome::IsRunningInMash()) {
1029 NOTIMPLEMENTED(); 1030 NOTIMPLEMENTED();
1030 return; 1031 return;
1031 } 1032 }
1032 if (ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(), 1033 if (ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(),
1033 ash::kShellWindowId_DesktopBackgroundContainer) 1034 ash::kShellWindowId_DesktopBackgroundContainer)
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
1369 1370
1370 locale_util::SwitchLanguageCallback callback( 1371 locale_util::SwitchLanguageCallback callback(
1371 base::Bind(&OnLanguageSwitchedCallback, base::Passed(std::move(data)))); 1372 base::Bind(&OnLanguageSwitchedCallback, base::Passed(std::move(data))));
1372 1373
1373 // Load locale keyboards here. Hardware layout would be automatically enabled. 1374 // Load locale keyboards here. Hardware layout would be automatically enabled.
1374 locale_util::SwitchLanguage(locale, true, true /* login_layouts_only */, 1375 locale_util::SwitchLanguage(locale, true, true /* login_layouts_only */,
1375 callback, ProfileManager::GetActiveUserProfile()); 1376 callback, ProfileManager::GetActiveUserProfile());
1376 } 1377 }
1377 1378
1378 } // namespace chromeos 1379 } // namespace chromeos
OLDNEW
« 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