| 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 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 227 added_display_observer_ = true; | 227 added_display_observer_ = true; |
| 228 Shell::GetInstance()->window_tree_host_manager()->AddObserver(this); | 228 Shell::GetInstance()->window_tree_host_manager()->AddObserver(this); |
| 229 } | 229 } |
| 230 display_observers_.AddObserver(observer); | 230 display_observers_.AddObserver(observer); |
| 231 } | 231 } |
| 232 | 232 |
| 233 void WmShellAura::RemoveDisplayObserver(WmDisplayObserver* observer) { | 233 void WmShellAura::RemoveDisplayObserver(WmDisplayObserver* observer) { |
| 234 display_observers_.RemoveObserver(observer); | 234 display_observers_.RemoveObserver(observer); |
| 235 } | 235 } |
| 236 | 236 |
| 237 void WmShellAura::AddPointerWatcher(views::PointerWatcher* watcher) { | 237 void WmShellAura::AddPointerWatcher(views::PointerWatcher* watcher, |
| 238 Shell::GetInstance()->AddPointerWatcher(watcher); | 238 bool wants_moves /*=false*/) { |
| 239 Shell::GetInstance()->AddPointerWatcher(watcher, wants_moves); |
| 239 } | 240 } |
| 240 | 241 |
| 241 void WmShellAura::RemovePointerWatcher(views::PointerWatcher* watcher) { | 242 void WmShellAura::RemovePointerWatcher(views::PointerWatcher* watcher) { |
| 242 Shell::GetInstance()->RemovePointerWatcher(watcher); | 243 Shell::GetInstance()->RemovePointerWatcher(watcher); |
| 243 } | 244 } |
| 244 | 245 |
| 245 bool WmShellAura::IsTouchDown() { | 246 bool WmShellAura::IsTouchDown() { |
| 246 return aura::Env::GetInstance()->is_touch_down(); | 247 return aura::Env::GetInstance()->is_touch_down(); |
| 247 } | 248 } |
| 248 | 249 |
| (...skipping 29 matching lines...) Expand all Loading... |
| 278 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, | 279 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, |
| 279 OnDisplayConfigurationChanging()); | 280 OnDisplayConfigurationChanging()); |
| 280 } | 281 } |
| 281 | 282 |
| 282 void WmShellAura::OnDisplayConfigurationChanged() { | 283 void WmShellAura::OnDisplayConfigurationChanged() { |
| 283 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, | 284 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, |
| 284 OnDisplayConfigurationChanged()); | 285 OnDisplayConfigurationChanged()); |
| 285 } | 286 } |
| 286 | 287 |
| 287 } // namespace ash | 288 } // namespace ash |
| OLD | NEW |