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/mus/bridge/wm_shell_mus.h" | 5 #include "ash/mus/bridge/wm_shell_mus.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "ash/common/accelerators/accelerator_controller.h" | 9 #include "ash/common/accelerators/accelerator_controller.h" |
10 #include "ash/common/display/display_info.h" | 10 #include "ash/common/display/display_info.h" |
(...skipping 362 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
373 | 373 |
374 void WmShellMus::AddDisplayObserver(WmDisplayObserver* observer) { | 374 void WmShellMus::AddDisplayObserver(WmDisplayObserver* observer) { |
375 NOTIMPLEMENTED(); | 375 NOTIMPLEMENTED(); |
376 } | 376 } |
377 | 377 |
378 void WmShellMus::RemoveDisplayObserver(WmDisplayObserver* observer) { | 378 void WmShellMus::RemoveDisplayObserver(WmDisplayObserver* observer) { |
379 NOTIMPLEMENTED(); | 379 NOTIMPLEMENTED(); |
380 } | 380 } |
381 | 381 |
382 void WmShellMus::AddPointerWatcher(views::PointerWatcher* watcher, | 382 void WmShellMus::AddPointerWatcher(views::PointerWatcher* watcher, |
383 bool wants_moves) { | 383 views::PointerWatcherEventTypes events) { |
384 pointer_watcher_event_router_->AddPointerWatcher(watcher, wants_moves); | 384 // TODO: implement drags for mus pointer watcher, http://crbug.com/641164. |
| 385 // NOTIMPLEMENTED drags for mus pointer watcher. |
| 386 pointer_watcher_event_router_->AddPointerWatcher( |
| 387 watcher, events == views::PointerWatcherEventTypes::MOVES); |
385 } | 388 } |
386 | 389 |
387 void WmShellMus::RemovePointerWatcher(views::PointerWatcher* watcher) { | 390 void WmShellMus::RemovePointerWatcher(views::PointerWatcher* watcher) { |
388 pointer_watcher_event_router_->RemovePointerWatcher(watcher); | 391 pointer_watcher_event_router_->RemovePointerWatcher(watcher); |
389 } | 392 } |
390 | 393 |
391 bool WmShellMus::IsTouchDown() { | 394 bool WmShellMus::IsTouchDown() { |
392 // TODO: implement me, http://crbug.com/634967. | 395 // TODO: implement me, http://crbug.com/634967. |
393 // NOTIMPLEMENTED is too spammy here. | 396 // NOTIMPLEMENTED is too spammy here. |
394 return false; | 397 return false; |
(...skipping 30 matching lines...) Expand all Loading... |
425 OnWindowActivated(gained_active, lost_active)); | 428 OnWindowActivated(gained_active, lost_active)); |
426 } | 429 } |
427 | 430 |
428 void WmShellMus::OnDidDestroyClient(ui::WindowTreeClient* client) { | 431 void WmShellMus::OnDidDestroyClient(ui::WindowTreeClient* client) { |
429 DCHECK_EQ(window_tree_client(), client); | 432 DCHECK_EQ(window_tree_client(), client); |
430 client->RemoveObserver(this); | 433 client->RemoveObserver(this); |
431 } | 434 } |
432 | 435 |
433 } // namespace mus | 436 } // namespace mus |
434 } // namespace ash | 437 } // namespace ash |
OLD | NEW |