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 "ash/ash_switches.h" | 7 #include "ash/ash_switches.h" |
8 #include "ash/desktop_background/desktop_background_controller.h" | 8 #include "ash/desktop_background/desktop_background_controller.h" |
9 #include "ash/desktop_background/user_wallpaper_delegate.h" | 9 #include "ash/desktop_background/user_wallpaper_delegate.h" |
10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
(...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
561 | 561 |
562 //////////////////////////////////////////////////////////////////////////////// | 562 //////////////////////////////////////////////////////////////////////////////// |
563 // LoginDisplayHostImpl, private | 563 // LoginDisplayHostImpl, private |
564 | 564 |
565 void LoginDisplayHostImpl::ShutdownDisplayHost(bool post_quit_task) { | 565 void LoginDisplayHostImpl::ShutdownDisplayHost(bool post_quit_task) { |
566 if (shutting_down_) | 566 if (shutting_down_) |
567 return; | 567 return; |
568 | 568 |
569 shutting_down_ = true; | 569 shutting_down_ = true; |
570 registrar_.RemoveAll(); | 570 registrar_.RemoveAll(); |
571 MessageLoop::current()->DeleteSoon(FROM_HERE, this); | 571 base::MessageLoop::current()->DeleteSoon(FROM_HERE, this); |
572 if (post_quit_task) | 572 if (post_quit_task) |
573 MessageLoop::current()->Quit(); | 573 base::MessageLoop::current()->Quit(); |
574 } | 574 } |
575 | 575 |
576 void LoginDisplayHostImpl::StartAnimation() { | 576 void LoginDisplayHostImpl::StartAnimation() { |
577 if (ash::Shell::GetContainer( | 577 if (ash::Shell::GetContainer( |
578 ash::Shell::GetPrimaryRootWindow(), | 578 ash::Shell::GetPrimaryRootWindow(), |
579 ash::internal::kShellWindowId_DesktopBackgroundContainer)-> | 579 ash::internal::kShellWindowId_DesktopBackgroundContainer)-> |
580 children().empty()) { | 580 children().empty()) { |
581 // If there is no background window, don't perform any animation on the | 581 // If there is no background window, don't perform any animation on the |
582 // default and background layer because there is nothing behind it. | 582 // default and background layer because there is nothing behind it. |
583 return; | 583 return; |
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
898 VLOG(1) << "Initial time zone: " << timezone_name; | 898 VLOG(1) << "Initial time zone: " << timezone_name; |
899 // Apply locale customizations only once to preserve whatever locale | 899 // Apply locale customizations only once to preserve whatever locale |
900 // user has changed to during OOBE. | 900 // user has changed to during OOBE. |
901 if (!timezone_name.empty()) { | 901 if (!timezone_name.empty()) { |
902 chromeos::system::TimezoneSettings::GetInstance()->SetTimezoneFromID( | 902 chromeos::system::TimezoneSettings::GetInstance()->SetTimezoneFromID( |
903 UTF8ToUTF16(timezone_name)); | 903 UTF8ToUTF16(timezone_name)); |
904 } | 904 } |
905 } | 905 } |
906 | 906 |
907 } // namespace chromeos | 907 } // namespace chromeos |
OLD | NEW |