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

Unified Diff: chrome/browser/lifetime/application_lifetime_aura.cc

Issue 211133005: [WIP] Not for review. Zero copy. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 6 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
« no previous file with comments | « no previous file | chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/lifetime/application_lifetime_aura.cc
diff --git a/chrome/browser/lifetime/application_lifetime_aura.cc b/chrome/browser/lifetime/application_lifetime_aura.cc
index 06bd542750e1461e8edd288d551752ca5a6dc3b2..26f3b169af0d3c28d8645768045a9e2cd9305cc8 100644
--- a/chrome/browser/lifetime/application_lifetime_aura.cc
+++ b/chrome/browser/lifetime/application_lifetime_aura.cc
@@ -19,7 +19,7 @@ void HandleAppExitingForPlatform() {
// Close all non browser windows now. Those includes notifications
// and windows created by Ash (launcher, background, etc).
g_browser_process->notification_ui_manager()->CancelAll();
-
+#if defined(USE_ASH)
// This may be called before |ash::Shell| is initialized when
// XIOError is reported. crbug.com/150633.
if (ash::Shell::HasInstance()) {
@@ -28,7 +28,7 @@ void HandleAppExitingForPlatform() {
aura::client::GetCaptureClient(ash::Shell::GetPrimaryRootWindow())->
SetCapture(NULL);
}
-
+#endif
views::Widget::CloseAllSecondaryWidgets();
#if defined(OS_CHROMEOS)
« no previous file with comments | « no previous file | chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698