| 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 245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 256 Shell::GetInstance()->window_tree_host_manager()->AddObserver(this); | 256 Shell::GetInstance()->window_tree_host_manager()->AddObserver(this); |
| 257 } | 257 } |
| 258 display_observers_.AddObserver(observer); | 258 display_observers_.AddObserver(observer); |
| 259 } | 259 } |
| 260 | 260 |
| 261 void WmShellAura::RemoveDisplayObserver(WmDisplayObserver* observer) { | 261 void WmShellAura::RemoveDisplayObserver(WmDisplayObserver* observer) { |
| 262 display_observers_.RemoveObserver(observer); | 262 display_observers_.RemoveObserver(observer); |
| 263 } | 263 } |
| 264 | 264 |
| 265 void WmShellAura::AddPointerWatcher(views::PointerWatcher* watcher, | 265 void WmShellAura::AddPointerWatcher(views::PointerWatcher* watcher, |
| 266 bool wants_moves) { | 266 views::PointerWatcherEventTypes events) { |
| 267 pointer_watcher_adapter_->AddPointerWatcher(watcher, wants_moves); | 267 pointer_watcher_adapter_->AddPointerWatcher(watcher, events); |
| 268 } | 268 } |
| 269 | 269 |
| 270 void WmShellAura::RemovePointerWatcher(views::PointerWatcher* watcher) { | 270 void WmShellAura::RemovePointerWatcher(views::PointerWatcher* watcher) { |
| 271 pointer_watcher_adapter_->RemovePointerWatcher(watcher); | 271 pointer_watcher_adapter_->RemovePointerWatcher(watcher); |
| 272 } | 272 } |
| 273 | 273 |
| 274 bool WmShellAura::IsTouchDown() { | 274 bool WmShellAura::IsTouchDown() { |
| 275 return aura::Env::GetInstance()->is_touch_down(); | 275 return aura::Env::GetInstance()->is_touch_down(); |
| 276 } | 276 } |
| 277 | 277 |
| (...skipping 29 matching lines...) Expand all Loading... |
| 307 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, | 307 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, |
| 308 OnDisplayConfigurationChanging()); | 308 OnDisplayConfigurationChanging()); |
| 309 } | 309 } |
| 310 | 310 |
| 311 void WmShellAura::OnDisplayConfigurationChanged() { | 311 void WmShellAura::OnDisplayConfigurationChanged() { |
| 312 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, | 312 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, |
| 313 OnDisplayConfigurationChanged()); | 313 OnDisplayConfigurationChanged()); |
| 314 } | 314 } |
| 315 | 315 |
| 316 } // namespace ash | 316 } // namespace ash |
| OLD | NEW |