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_delegate_aura.h" | 7 #include "ash/accelerators/accelerator_controller_delegate_aura.h" |
8 #include "ash/common/accelerators/accelerator_controller.h" | 8 #include "ash/common/accelerators/accelerator_controller.h" |
9 #include "ash/common/accessibility_types.h" | 9 #include "ash/common/accessibility_types.h" |
10 #include "ash/common/wm_shell.h" | 10 #include "ash/common/wm_shell.h" |
(...skipping 20 matching lines...) Expand all Loading... |
31 #include "chrome/common/chrome_switches.h" | 31 #include "chrome/common/chrome_switches.h" |
32 #include "chromeos/accelerometer/accelerometer_reader.h" | 32 #include "chromeos/accelerometer/accelerometer_reader.h" |
33 #include "chromeos/chromeos_switches.h" | 33 #include "chromeos/chromeos_switches.h" |
34 #include "chromeos/login/login_state.h" | 34 #include "chromeos/login/login_state.h" |
35 #include "content/public/browser/browser_thread.h" | 35 #include "content/public/browser/browser_thread.h" |
36 #include "content/public/browser/context_factory.h" | 36 #include "content/public/browser/context_factory.h" |
37 #include "ui/aura/env.h" | 37 #include "ui/aura/env.h" |
38 #include "ui/aura/window_tree_host.h" | 38 #include "ui/aura/window_tree_host.h" |
39 | 39 |
40 #if defined(USE_X11) | 40 #if defined(USE_X11) |
41 #include "ui/base/x/x11_util.h" | 41 #include "ui/base/x/x11_util.h" // nogncheck |
42 #endif | 42 #endif |
43 | 43 |
44 namespace chrome { | 44 namespace chrome { |
45 | 45 |
46 void OpenAsh(gfx::AcceleratedWidget remote_window) { | 46 void OpenAsh(gfx::AcceleratedWidget remote_window) { |
47 #if defined(USE_X11) | 47 #if defined(USE_X11) |
48 if (base::SysInfo::IsRunningOnChromeOS()) { | 48 if (base::SysInfo::IsRunningOnChromeOS()) { |
49 // Hides the cursor outside of the Aura root window. The cursor will be | 49 // Hides the cursor outside of the Aura root window. The cursor will be |
50 // drawn within the Aura root window, and it'll remain hidden after the | 50 // drawn within the Aura root window, and it'll remain hidden after the |
51 // Aura window is closed. | 51 // Aura window is closed. |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
103 } | 103 } |
104 | 104 |
105 void CloseAsh() { | 105 void CloseAsh() { |
106 if (ash::Shell::HasInstance()) { | 106 if (ash::Shell::HasInstance()) { |
107 ash::Shell::DeleteInstance(); | 107 ash::Shell::DeleteInstance(); |
108 ash::ShellContentState::DestroyInstance(); | 108 ash::ShellContentState::DestroyInstance(); |
109 } | 109 } |
110 } | 110 } |
111 | 111 |
112 } // namespace chrome | 112 } // namespace chrome |
OLD | NEW |