| 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 "ash/aura/wm_shell_aura.h" | 5 #include "ash/aura/wm_shell_aura.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "ash/aura/wm_window_aura.h" | 9 #include "ash/aura/wm_window_aura.h" |
| 10 #include "ash/common/session/session_state_delegate.h" | 10 #include "ash/common/session/session_state_delegate.h" |
| (...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 198 added_display_observer_ = true; | 198 added_display_observer_ = true; |
| 199 Shell::GetInstance()->window_tree_host_manager()->AddObserver(this); | 199 Shell::GetInstance()->window_tree_host_manager()->AddObserver(this); |
| 200 } | 200 } |
| 201 display_observers_.AddObserver(observer); | 201 display_observers_.AddObserver(observer); |
| 202 } | 202 } |
| 203 | 203 |
| 204 void WmShellAura::RemoveDisplayObserver(WmDisplayObserver* observer) { | 204 void WmShellAura::RemoveDisplayObserver(WmDisplayObserver* observer) { |
| 205 display_observers_.RemoveObserver(observer); | 205 display_observers_.RemoveObserver(observer); |
| 206 } | 206 } |
| 207 | 207 |
| 208 void WmShellAura::AddPointerWatcher(views::PointerWatcher* watcher) { | 208 void WmShellAura::AddPointerDownWatcher(views::PointerDownWatcher* watcher) { |
| 209 Shell::GetInstance()->AddPointerWatcher(watcher); | 209 Shell::GetInstance()->AddPointerDownWatcher(watcher); |
| 210 } | 210 } |
| 211 | 211 |
| 212 void WmShellAura::RemovePointerWatcher(views::PointerWatcher* watcher) { | 212 void WmShellAura::RemovePointerDownWatcher(views::PointerDownWatcher* watcher) { |
| 213 Shell::GetInstance()->RemovePointerWatcher(watcher); | 213 Shell::GetInstance()->RemovePointerDownWatcher(watcher); |
| 214 } | 214 } |
| 215 | 215 |
| 216 #if defined(OS_CHROMEOS) | 216 #if defined(OS_CHROMEOS) |
| 217 void WmShellAura::ToggleIgnoreExternalKeyboard() { | 217 void WmShellAura::ToggleIgnoreExternalKeyboard() { |
| 218 Shell::GetInstance() | 218 Shell::GetInstance() |
| 219 ->virtual_keyboard_controller() | 219 ->virtual_keyboard_controller() |
| 220 ->ToggleIgnoreExternalKeyboard(); | 220 ->ToggleIgnoreExternalKeyboard(); |
| 221 } | 221 } |
| 222 #endif | 222 #endif |
| 223 | 223 |
| (...skipping 18 matching lines...) Expand all Loading... |
| 242 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, | 242 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, |
| 243 OnDisplayConfigurationChanging()); | 243 OnDisplayConfigurationChanging()); |
| 244 } | 244 } |
| 245 | 245 |
| 246 void WmShellAura::OnDisplayConfigurationChanged() { | 246 void WmShellAura::OnDisplayConfigurationChanged() { |
| 247 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, | 247 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, |
| 248 OnDisplayConfigurationChanged()); | 248 OnDisplayConfigurationChanged()); |
| 249 } | 249 } |
| 250 | 250 |
| 251 } // namespace ash | 251 } // namespace ash |
| OLD | NEW |