| 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)
|
|
|