Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "components/exo/wm_helper_ash.h" | 5 #include "components/exo/wm_helper_ash.h" |
| 6 | 6 |
| 7 #include "ash/accessibility_delegate.h" | 7 #include "ash/accessibility_delegate.h" |
| 8 #include "ash/public/cpp/config.h" | 8 #include "ash/public/cpp/config.h" |
| 9 #include "ash/root_window_controller.h" | 9 #include "ash/root_window_controller.h" |
| 10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 122 } | 122 } |
| 123 | 123 |
| 124 bool WMHelperAsh::IsSpokenFeedbackEnabled() const { | 124 bool WMHelperAsh::IsSpokenFeedbackEnabled() const { |
| 125 return ash::Shell::Get()->accessibility_delegate()->IsSpokenFeedbackEnabled(); | 125 return ash::Shell::Get()->accessibility_delegate()->IsSpokenFeedbackEnabled(); |
| 126 } | 126 } |
| 127 | 127 |
| 128 void WMHelperAsh::PlayEarcon(int sound_key) const { | 128 void WMHelperAsh::PlayEarcon(int sound_key) const { |
| 129 return ash::Shell::Get()->accessibility_delegate()->PlayEarcon(sound_key); | 129 return ash::Shell::Get()->accessibility_delegate()->PlayEarcon(sound_key); |
| 130 } | 130 } |
| 131 | 131 |
| 132 void WMHelperAsh::SetCursor(gfx::NativeCursor cursor) { | |
| 133 ash::Shell* shell = ash::Shell::GetInstance(); | |
|
oshima
2017/04/26 22:13:39
nit ::Get()
| |
| 134 static_cast<wm::NativeCursorManager*>(shell->native_cursor_manager()) | |
| 135 ->SetCursor(cursor, shell->cursor_manager()); | |
|
oshima
2017/04/26 22:13:39
NativeCursorManager is to provide platform impls,
Dominik Laskowski
2017/04/27 20:27:20
Not really. It's mostly for consistency with Ash i
| |
| 136 } | |
| 137 | |
| 132 void WMHelperAsh::OnWindowActivated( | 138 void WMHelperAsh::OnWindowActivated( |
| 133 aura::client::ActivationChangeObserver::ActivationReason reason, | 139 aura::client::ActivationChangeObserver::ActivationReason reason, |
| 134 aura::Window* gained_active, | 140 aura::Window* gained_active, |
| 135 aura::Window* lost_active) { | 141 aura::Window* lost_active) { |
| 136 NotifyWindowActivated(gained_active, lost_active); | 142 NotifyWindowActivated(gained_active, lost_active); |
| 137 } | 143 } |
| 138 | 144 |
| 139 void WMHelperAsh::OnWindowFocused(aura::Window* gained_focus, | 145 void WMHelperAsh::OnWindowFocused(aura::Window* gained_focus, |
| 140 aura::Window* lost_focus) { | 146 aura::Window* lost_focus) { |
| 141 NotifyWindowFocused(gained_focus, lost_focus); | 147 NotifyWindowFocused(gained_focus, lost_focus); |
| (...skipping 30 matching lines...) Expand all Loading... | |
| 172 | 178 |
| 173 void WMHelperAsh::OnDisplayConfigurationChanged() { | 179 void WMHelperAsh::OnDisplayConfigurationChanged() { |
| 174 NotifyDisplayConfigurationChanged(); | 180 NotifyDisplayConfigurationChanged(); |
| 175 } | 181 } |
| 176 | 182 |
| 177 void WMHelperAsh::OnKeyboardDeviceConfigurationChanged() { | 183 void WMHelperAsh::OnKeyboardDeviceConfigurationChanged() { |
| 178 NotifyKeyboardDeviceConfigurationChanged(); | 184 NotifyKeyboardDeviceConfigurationChanged(); |
| 179 } | 185 } |
| 180 | 186 |
| 181 } // namespace exo | 187 } // namespace exo |
| OLD | NEW |