| 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/keyboard/keyboard_ui.h" | 10 #include "ash/common/keyboard/keyboard_ui.h" |
| (...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 381 | 381 |
| 382 void WmShellMus::AddDisplayObserver(WmDisplayObserver* observer) { | 382 void WmShellMus::AddDisplayObserver(WmDisplayObserver* observer) { |
| 383 NOTIMPLEMENTED(); | 383 NOTIMPLEMENTED(); |
| 384 } | 384 } |
| 385 | 385 |
| 386 void WmShellMus::RemoveDisplayObserver(WmDisplayObserver* observer) { | 386 void WmShellMus::RemoveDisplayObserver(WmDisplayObserver* observer) { |
| 387 NOTIMPLEMENTED(); | 387 NOTIMPLEMENTED(); |
| 388 } | 388 } |
| 389 | 389 |
| 390 void WmShellMus::AddPointerWatcher(views::PointerWatcher* watcher, | 390 void WmShellMus::AddPointerWatcher(views::PointerWatcher* watcher, |
| 391 bool wants_moves) { | 391 views::PointerWatcherEventTypes events) { |
| 392 pointer_watcher_event_router_->AddPointerWatcher(watcher, wants_moves); | 392 // TODO: implement drags for mus pointer watcher, http://crbug.com/641164. |
| 393 // NOTIMPLEMENTED drags for mus pointer watcher. |
| 394 pointer_watcher_event_router_->AddPointerWatcher( |
| 395 watcher, events == views::PointerWatcherEventTypes::MOVES); |
| 393 } | 396 } |
| 394 | 397 |
| 395 void WmShellMus::RemovePointerWatcher(views::PointerWatcher* watcher) { | 398 void WmShellMus::RemovePointerWatcher(views::PointerWatcher* watcher) { |
| 396 pointer_watcher_event_router_->RemovePointerWatcher(watcher); | 399 pointer_watcher_event_router_->RemovePointerWatcher(watcher); |
| 397 } | 400 } |
| 398 | 401 |
| 399 bool WmShellMus::IsTouchDown() { | 402 bool WmShellMus::IsTouchDown() { |
| 400 // TODO: implement me, http://crbug.com/634967. | 403 // TODO: implement me, http://crbug.com/634967. |
| 401 // NOTIMPLEMENTED is too spammy here. | 404 // NOTIMPLEMENTED is too spammy here. |
| 402 return false; | 405 return false; |
| (...skipping 30 matching lines...) Expand all Loading... |
| 433 OnWindowActivated(gained_active, lost_active)); | 436 OnWindowActivated(gained_active, lost_active)); |
| 434 } | 437 } |
| 435 | 438 |
| 436 void WmShellMus::OnDidDestroyClient(ui::WindowTreeClient* client) { | 439 void WmShellMus::OnDidDestroyClient(ui::WindowTreeClient* client) { |
| 437 DCHECK_EQ(window_tree_client(), client); | 440 DCHECK_EQ(window_tree_client(), client); |
| 438 client->RemoveObserver(this); | 441 client->RemoveObserver(this); |
| 439 } | 442 } |
| 440 | 443 |
| 441 } // namespace mus | 444 } // namespace mus |
| 442 } // namespace ash | 445 } // namespace ash |
| OLD | NEW |