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

Unified Diff: chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc

Issue 205963005: Delete "shutdown without closing browsers" path (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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
Index: chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc b/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
index 39ba0d31c3fd30803a780476aaadf1def9821eea..3b7864f24cf071d4bd9dd1977891f157cfcd6238 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
@@ -237,10 +237,8 @@ void ChromeShellDelegate::PreInit() {
new chromeos::DisplayConfigurationObserver());
}
-void ChromeShellDelegate::Shutdown() {
- content::RecordAction(base::UserMetricsAction("Shutdown"));
- chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
- RequestShutdown();
+void ChromeShellDelegate::PreShutdown() {
+ display_configuration_observer_.reset();
}
ash::SessionStateDelegate* ChromeShellDelegate::CreateSessionStateDelegate() {
@@ -285,11 +283,6 @@ void ChromeShellDelegate::Observe(int type,
InitAfterSessionStart();
ash::Shell::GetInstance()->ShowShelf();
break;
- case chrome::NOTIFICATION_APP_TERMINATING:
- // Let classes unregister themselves as observers of the
- // ash::Shell singleton before the shell is destroyed.
- display_configuration_observer_.reset();
- break;
default:
NOTREACHED() << "Unexpected notification " << type;
}
@@ -302,7 +295,4 @@ void ChromeShellDelegate::PlatformInit() {
registrar_.Add(this,
chrome::NOTIFICATION_SESSION_STARTED,
content::NotificationService::AllSources());
- registrar_.Add(this,
- chrome::NOTIFICATION_APP_TERMINATING,
- content::NotificationService::AllSources());
}

Powered by Google App Engine
This is Rietveld 408576698