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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/ash/ash_init.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
« ash/shell_delegate.h ('K') | « chrome/browser/lifetime/application_lifetime.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate.h » ('j') | chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/ash_init.cc
diff --git a/chrome/browser/ui/ash/ash_init.cc b/chrome/browser/ui/ash/ash_init.cc
index 8cfd74d117a6d758a463160f20ac9fe20cca3847..39824cdfb1323b872de6d953dda6e2817159786c 100644
--- a/chrome/browser/ui/ash/ash_init.cc
+++ b/chrome/browser/ui/ash/ash_init.cc
@@ -83,12 +83,8 @@ void OpenAsh() {
}
void CloseAsh() {
- // If shutdown is initiated by |BrowserX11IOErrorHandler|, don't
- // try to cleanup resources.
- if (!browser_shutdown::ShuttingDownWithoutClosingBrowsers() &&
- ash::Shell::HasInstance()) {
+ if (ash::Shell::HasInstance())
ash::Shell::DeleteInstance();
- }
}
} // namespace chrome
« ash/shell_delegate.h ('K') | « chrome/browser/lifetime/application_lifetime.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate.h » ('j') | chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698