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/pointer_watcher_adapter.h" | 9 #include "ash/aura/pointer_watcher_adapter.h" |
10 #include "ash/aura/wm_window_aura.h" | 10 #include "ash/aura/wm_window_aura.h" |
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
249 Shell::GetInstance()->window_tree_host_manager()->AddObserver(this); | 249 Shell::GetInstance()->window_tree_host_manager()->AddObserver(this); |
250 } | 250 } |
251 display_observers_.AddObserver(observer); | 251 display_observers_.AddObserver(observer); |
252 } | 252 } |
253 | 253 |
254 void WmShellAura::RemoveDisplayObserver(WmDisplayObserver* observer) { | 254 void WmShellAura::RemoveDisplayObserver(WmDisplayObserver* observer) { |
255 display_observers_.RemoveObserver(observer); | 255 display_observers_.RemoveObserver(observer); |
256 } | 256 } |
257 | 257 |
258 void WmShellAura::AddPointerWatcher(views::PointerWatcher* watcher, | 258 void WmShellAura::AddPointerWatcher(views::PointerWatcher* watcher, |
259 bool wants_moves) { | 259 views::PointerWatcherEventTypes events) { |
260 pointer_watcher_adapter_->AddPointerWatcher(watcher, wants_moves); | 260 pointer_watcher_adapter_->AddPointerWatcher(watcher, events); |
261 } | 261 } |
262 | 262 |
263 void WmShellAura::RemovePointerWatcher(views::PointerWatcher* watcher) { | 263 void WmShellAura::RemovePointerWatcher(views::PointerWatcher* watcher) { |
264 pointer_watcher_adapter_->RemovePointerWatcher(watcher); | 264 pointer_watcher_adapter_->RemovePointerWatcher(watcher); |
265 } | 265 } |
266 | 266 |
267 bool WmShellAura::IsTouchDown() { | 267 bool WmShellAura::IsTouchDown() { |
268 return aura::Env::GetInstance()->is_touch_down(); | 268 return aura::Env::GetInstance()->is_touch_down(); |
269 } | 269 } |
270 | 270 |
(...skipping 29 matching lines...) Expand all Loading... |
300 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, | 300 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, |
301 OnDisplayConfigurationChanging()); | 301 OnDisplayConfigurationChanging()); |
302 } | 302 } |
303 | 303 |
304 void WmShellAura::OnDisplayConfigurationChanged() { | 304 void WmShellAura::OnDisplayConfigurationChanged() { |
305 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, | 305 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, |
306 OnDisplayConfigurationChanged()); | 306 OnDisplayConfigurationChanged()); |
307 } | 307 } |
308 | 308 |
309 } // namespace ash | 309 } // namespace ash |
OLD | NEW |