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 <vector> | 7 #include <vector> |
8 | 8 |
9 #include "ash/ash_switches.h" | 9 #include "ash/ash_switches.h" |
10 #include "ash/desktop_background/desktop_background_controller.h" | 10 #include "ash/desktop_background/desktop_background_controller.h" |
(...skipping 571 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
582 | 582 |
583 //////////////////////////////////////////////////////////////////////////////// | 583 //////////////////////////////////////////////////////////////////////////////// |
584 // LoginDisplayHostImpl, private | 584 // LoginDisplayHostImpl, private |
585 | 585 |
586 void LoginDisplayHostImpl::ShutdownDisplayHost(bool post_quit_task) { | 586 void LoginDisplayHostImpl::ShutdownDisplayHost(bool post_quit_task) { |
587 if (shutting_down_) | 587 if (shutting_down_) |
588 return; | 588 return; |
589 | 589 |
590 shutting_down_ = true; | 590 shutting_down_ = true; |
591 registrar_.RemoveAll(); | 591 registrar_.RemoveAll(); |
592 MessageLoop::current()->DeleteSoon(FROM_HERE, this); | 592 base::MessageLoop::current()->DeleteSoon(FROM_HERE, this); |
593 if (post_quit_task) | 593 if (post_quit_task) |
594 MessageLoop::current()->Quit(); | 594 base::MessageLoop::current()->Quit(); |
595 } | 595 } |
596 | 596 |
597 void LoginDisplayHostImpl::StartAnimation() { | 597 void LoginDisplayHostImpl::StartAnimation() { |
598 if (ash::Shell::GetContainer( | 598 if (ash::Shell::GetContainer( |
599 ash::Shell::GetPrimaryRootWindow(), | 599 ash::Shell::GetPrimaryRootWindow(), |
600 ash::internal::kShellWindowId_DesktopBackgroundContainer)-> | 600 ash::internal::kShellWindowId_DesktopBackgroundContainer)-> |
601 children().empty()) { | 601 children().empty()) { |
602 // If there is no background window, don't perform any animation on the | 602 // If there is no background window, don't perform any animation on the |
603 // default and background layer because there is nothing behind it. | 603 // default and background layer because there is nothing behind it. |
604 return; | 604 return; |
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
919 VLOG(1) << "Initial time zone: " << timezone_name; | 919 VLOG(1) << "Initial time zone: " << timezone_name; |
920 // Apply locale customizations only once to preserve whatever locale | 920 // Apply locale customizations only once to preserve whatever locale |
921 // user has changed to during OOBE. | 921 // user has changed to during OOBE. |
922 if (!timezone_name.empty()) { | 922 if (!timezone_name.empty()) { |
923 chromeos::system::TimezoneSettings::GetInstance()->SetTimezoneFromID( | 923 chromeos::system::TimezoneSettings::GetInstance()->SetTimezoneFromID( |
924 UTF8ToUTF16(timezone_name)); | 924 UTF8ToUTF16(timezone_name)); |
925 } | 925 } |
926 } | 926 } |
927 | 927 |
928 } // namespace chromeos | 928 } // namespace chromeos |
OLD | NEW |