OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/ash/ash_init.h" | 5 #include "chrome/browser/ui/ash/ash_init.h" |
6 | 6 |
7 #include "ash/accelerators/accelerator_controller.h" | 7 #include "ash/accelerators/accelerator_controller.h" |
8 #include "ash/ash_switches.h" | 8 #include "ash/ash_switches.h" |
9 #include "ash/high_contrast/high_contrast_controller.h" | 9 #include "ash/high_contrast/high_contrast_controller.h" |
10 #include "ash/magnifier/magnification_controller.h" | 10 #include "ash/magnifier/magnification_controller.h" |
11 #include "ash/magnifier/partial_magnification_controller.h" | 11 #include "ash/magnifier/partial_magnification_controller.h" |
12 #include "ash/shell.h" | 12 #include "ash/shell.h" |
13 #include "base/command_line.h" | 13 #include "base/command_line.h" |
| 14 #include "chrome/browser/browser_shutdown.h" |
14 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" | 15 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" |
15 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" | 16 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" |
16 #include "chrome/browser/lifetime/application_lifetime.h" | 17 #include "chrome/browser/lifetime/application_lifetime.h" |
17 #include "chrome/browser/ui/ash/chrome_shell_delegate.h" | 18 #include "chrome/browser/ui/ash/chrome_shell_delegate.h" |
18 #include "chrome/browser/ui/ash/screenshot_taker.h" | 19 #include "chrome/browser/ui/ash/screenshot_taker.h" |
19 #include "chrome/common/chrome_switches.h" | 20 #include "chrome/common/chrome_switches.h" |
20 #include "ui/aura/env.h" | 21 #include "ui/aura/env.h" |
21 #include "ui/aura/window_tree_host.h" | 22 #include "ui/aura/window_tree_host.h" |
22 | 23 |
23 #if defined(OS_CHROMEOS) | 24 #if defined(OS_CHROMEOS) |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
75 | 76 |
76 if (!CommandLine::ForCurrentProcess()->HasSwitch( | 77 if (!CommandLine::ForCurrentProcess()->HasSwitch( |
77 switches::kDisableZeroBrowsersOpenForTests)) { | 78 switches::kDisableZeroBrowsersOpenForTests)) { |
78 chrome::IncrementKeepAliveCount(); | 79 chrome::IncrementKeepAliveCount(); |
79 } | 80 } |
80 #endif | 81 #endif |
81 ash::Shell::GetPrimaryRootWindow()->GetHost()->Show(); | 82 ash::Shell::GetPrimaryRootWindow()->GetHost()->Show(); |
82 } | 83 } |
83 | 84 |
84 void CloseAsh() { | 85 void CloseAsh() { |
85 if (ash::Shell::HasInstance()) | 86 // If shutdown is initiated by |BrowserX11IOErrorHandler|, don't |
| 87 // try to cleanup resources. |
| 88 if (!browser_shutdown::ShuttingDownWithoutClosingBrowsers() && |
| 89 ash::Shell::HasInstance()) { |
86 ash::Shell::DeleteInstance(); | 90 ash::Shell::DeleteInstance(); |
| 91 } |
87 } | 92 } |
88 | 93 |
89 } // namespace chrome | 94 } // namespace chrome |
OLD | NEW |