Remove USE_ASH in application_lifetime_aura.cc.

As written, we don't call CancelAll() on desktop platforms.

BUG=379332

Review URL: https://codereview.chromium.org/306393004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275208 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 10 deletions

diff --git a/chrome/browser/lifetime/application_lifetime_aura.cc b/chrome/browser/lifetime/application_lifetime_aura.cc
index 4911179..06bd542 100644
--- a/chrome/browser/lifetime/application_lifetime_aura.cc
+++ b/chrome/browser/lifetime/application_lifetime_aura.cc
@@ -4,36 +4,30 @@
 
 #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"
 #include "chrome/common/chrome_switches.h"
+#include "ui/aura/client/capture_client.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/views/widget/widget.h"
 
-#if defined(USE_ASH)
-#include "ash/shell.h"
-#include "ui/aura/client/capture_client.h"
-#endif
-
 namespace chrome {
 
 void HandleAppExitingForPlatform() {
   // Close all non browser windows now. Those includes notifications
   // and windows created by Ash (launcher, background, etc).
-#if defined(USE_ASH)
+  g_browser_process->notification_ui_manager()->CancelAll();
+
   // This may be called before |ash::Shell| is initialized when
   // XIOError is reported.  crbug.com/150633.
   if (ash::Shell::HasInstance()) {
-    g_browser_process->notification_ui_manager()->CancelAll();
     // Releasing the capture will close any menus that might be open:
     // http://crbug.com/134472
     aura::client::GetCaptureClient(ash::Shell::GetPrimaryRootWindow())->
         SetCapture(NULL);
   }
-#else
-  g_browser_process->notification_ui_manager()->CancelAll();
-#endif
 
   views::Widget::CloseAllSecondaryWidgets();