Fix crashers in GetPrimaryDisplay

chrome/browser/lifetime/application_lifetime_aura.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/lifetime/application_lifetime.h"
 
 #include "base/command_line.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 
 #if defined(USE_ASH)
 #include "ash/shell.h"
 #include "ui/aura/client/capture_client.h"
 #endif
 
 namespace browser {
 
 void HandleAppExitingForPlatform() {
   // Close all non browser windows now. Those includes notifications
   // and windows created by Ash (launcher, background, etc).
+#if defined(USE_ASH)
+  // This may be called before ASH is initialized when XIOError is reported.

[Daniel Erat, 2012/09/19 20:47:33]

nit: s/ASH/Ash/ or just "ash"

[oshima, 2012/09/19 21:21:28]

changed to |ash::Shell|

+  // 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();
-
-#if defined(USE_ASH)
-  // Releasing the capture will close any menus that might be open:
-  // http://crbug.com/134472
-  aura::client::GetCaptureClient(ash::Shell::GetPrimaryRootWindow())->
-      SetCapture(NULL);
 #endif
 
   // TODO(oshima): Close all non browser windows here while
   // the message loop is still alive.
 
 #if defined(OS_CHROMEOS)
   if (!CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kDisableZeroBrowsersOpenForTests)) {
     // App is exiting, call EndKeepAlive() on behalf of Aura Shell.
     EndKeepAlive();
     // Make sure we have notified the session manager that we are exiting.
     // This might be called from FastShutdown() or CloseAllBrowsers(), but not
     // if something prevents a browser from closing before SetTryingToQuit()
     // gets called (e.g. browser->TabsNeedBeforeUnloadFired() is true).
     // NotifyAndTerminate does nothing if called more than once.
     NotifyAndTerminate(true);
   }
 #endif // OS_CHROMEOS
 }
 
 }  // namespace browser