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/desktop_background/desktop_background_controller.h" | 9 #include "ash/desktop_background/desktop_background_controller.h" |
10 #include "ash/desktop_background/user_wallpaper_delegate.h" | 10 #include "ash/desktop_background/user_wallpaper_delegate.h" |
(...skipping 585 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
596 desktop_background_controller()->MoveDesktopToLockedContainer(); | 596 desktop_background_controller()->MoveDesktopToLockedContainer(); |
597 registrar_.Remove(this, | 597 registrar_.Remove(this, |
598 chrome::NOTIFICATION_LOGIN_USER_CHANGED, | 598 chrome::NOTIFICATION_LOGIN_USER_CHANGED, |
599 content::NotificationService::AllSources()); | 599 content::NotificationService::AllSources()); |
600 } | 600 } |
601 } | 601 } |
602 | 602 |
603 //////////////////////////////////////////////////////////////////////////////// | 603 //////////////////////////////////////////////////////////////////////////////// |
604 // LoginDisplayHostImpl, WebContentsObserver implementation: | 604 // LoginDisplayHostImpl, WebContentsObserver implementation: |
605 | 605 |
606 void LoginDisplayHostImpl::RenderViewGone(base::TerminationStatus status) { | 606 void LoginDisplayHostImpl::RenderProcessGone(base::TerminationStatus status) { |
607 // Do not try to restore on shutdown | 607 // Do not try to restore on shutdown |
608 if (browser_shutdown::GetShutdownType() != browser_shutdown::NOT_VALID) | 608 if (browser_shutdown::GetShutdownType() != browser_shutdown::NOT_VALID) |
609 return; | 609 return; |
610 | 610 |
611 crash_count_++; | 611 crash_count_++; |
612 if (crash_count_ > kCrashCountLimit) | 612 if (crash_count_ > kCrashCountLimit) |
613 return; | 613 return; |
614 | 614 |
615 if (status != base::TERMINATION_STATUS_NORMAL_TERMINATION) { | 615 if (status != base::TERMINATION_STATUS_NORMAL_TERMINATION) { |
616 // Render with login screen crashed. Let's crash browser process to let | 616 // Render with login screen crashed. Let's crash browser process to let |
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
965 VLOG(1) << "Initial time zone: " << timezone_name; | 965 VLOG(1) << "Initial time zone: " << timezone_name; |
966 // Apply locale customizations only once to preserve whatever locale | 966 // Apply locale customizations only once to preserve whatever locale |
967 // user has changed to during OOBE. | 967 // user has changed to during OOBE. |
968 if (!timezone_name.empty()) { | 968 if (!timezone_name.empty()) { |
969 chromeos::system::TimezoneSettings::GetInstance()->SetTimezoneFromID( | 969 chromeos::system::TimezoneSettings::GetInstance()->SetTimezoneFromID( |
970 UTF8ToUTF16(timezone_name)); | 970 UTF8ToUTF16(timezone_name)); |
971 } | 971 } |
972 } | 972 } |
973 | 973 |
974 } // namespace chromeos | 974 } // namespace chromeos |
OLD | NEW |