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

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

Issue 1391893003: NOT FOR REVIEW: Aura on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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/lifetime/application_lifetime_aura.cc
diff --git a/chrome/browser/lifetime/application_lifetime_aura.cc b/chrome/browser/lifetime/application_lifetime_aura.cc
index 75d67bae8588d0be4b9bddcc62e7089cd362d412..7e74255b0886a6c8d0ca08a86eda387b86834fb3 100644
--- a/chrome/browser/lifetime/application_lifetime_aura.cc
+++ b/chrome/browser/lifetime/application_lifetime_aura.cc
@@ -20,6 +20,7 @@ void HandleAppExitingForPlatform() {
// and windows created by Ash (launcher, background, etc).
g_browser_process->notification_ui_manager()->CancelAll();
+#if !defined(OS_ANDROID)
// This may be called before |ash::Shell| is initialized when
// XIOError is reported. crbug.com/150633.
if (ash::Shell::HasInstance()) {
@@ -28,6 +29,7 @@ void HandleAppExitingForPlatform() {
aura::client::GetCaptureClient(ash::Shell::GetPrimaryRootWindow())->
SetCapture(NULL);
}
+#endif
views::Widget::CloseAllSecondaryWidgets();

Powered by Google App Engine
This is Rietveld 408576698