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

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

Issue 1469443002: Guard Ash code with USE_ASH in chrome/browser/lifetime/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed unnecessary comments Created 5 years, 1 month 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 | no next file » | 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 75d67bae8588d0be4b9bddcc62e7089cd362d412..9790d2ade6c8ef53ee7386f3ebc5da40a1e1d437 100644
--- a/chrome/browser/lifetime/application_lifetime_aura.cc
+++ b/chrome/browser/lifetime/application_lifetime_aura.cc
@@ -4,7 +4,6 @@
#include "chrome/browser/lifetime/application_lifetime.h"
-#include "ash/shell.h"
#include "base/command_line.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/notifications/notification_ui_manager.h"
@@ -13,6 +12,10 @@
#include "ui/aura/window_event_dispatcher.h"
#include "ui/views/widget/widget.h"
+#if defined(USE_ASH)
+#include "ash/shell.h"
+#endif
+
namespace chrome {
void HandleAppExitingForPlatform() {
@@ -20,6 +23,7 @@ void HandleAppExitingForPlatform() {
// 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,6 +32,7 @@ void HandleAppExitingForPlatform() {
aura::client::GetCaptureClient(ash::Shell::GetPrimaryRootWindow())->
SetCapture(NULL);
}
+#endif
views::Widget::CloseAllSecondaryWidgets();
@@ -43,7 +48,7 @@ void HandleAppExitingForPlatform() {
// NotifyAndTerminate does nothing if called more than once.
NotifyAndTerminate(true);
}
-#endif // OS_CHROMEOS
+#endif
}
} // namespace chrome
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698