| 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 356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 367 | 367 |
| 368 void WmShellMus::AddDisplayObserver(WmDisplayObserver* observer) { | 368 void WmShellMus::AddDisplayObserver(WmDisplayObserver* observer) { |
| 369 NOTIMPLEMENTED(); | 369 NOTIMPLEMENTED(); |
| 370 } | 370 } |
| 371 | 371 |
| 372 void WmShellMus::RemoveDisplayObserver(WmDisplayObserver* observer) { | 372 void WmShellMus::RemoveDisplayObserver(WmDisplayObserver* observer) { |
| 373 NOTIMPLEMENTED(); | 373 NOTIMPLEMENTED(); |
| 374 } | 374 } |
| 375 | 375 |
| 376 void WmShellMus::AddPointerWatcher(views::PointerWatcher* watcher, | 376 void WmShellMus::AddPointerWatcher(views::PointerWatcher* watcher, |
| 377 bool wants_moves) { | 377 views::RequestedEvents events) { |
| 378 // TODO: implement drags for mus pointer watcher, http://crbug.com/641164. |
| 379 // NOTIMPLEMENTED drags for mus pointer watcher. |
| 380 const bool wants_moves = events == views::RequestedEvents::MOVES; |
| 378 pointer_watcher_event_router_->AddPointerWatcher(watcher, wants_moves); | 381 pointer_watcher_event_router_->AddPointerWatcher(watcher, wants_moves); |
| 379 } | 382 } |
| 380 | 383 |
| 381 void WmShellMus::RemovePointerWatcher(views::PointerWatcher* watcher) { | 384 void WmShellMus::RemovePointerWatcher(views::PointerWatcher* watcher) { |
| 382 pointer_watcher_event_router_->RemovePointerWatcher(watcher); | 385 pointer_watcher_event_router_->RemovePointerWatcher(watcher); |
| 383 } | 386 } |
| 384 | 387 |
| 385 bool WmShellMus::IsTouchDown() { | 388 bool WmShellMus::IsTouchDown() { |
| 386 // TODO: implement me, http://crbug.com/634967. | 389 // TODO: implement me, http://crbug.com/634967. |
| 387 // NOTIMPLEMENTED is too spammy here. | 390 // NOTIMPLEMENTED is too spammy here. |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 419 OnWindowActivated(gained_active, lost_active)); | 422 OnWindowActivated(gained_active, lost_active)); |
| 420 } | 423 } |
| 421 | 424 |
| 422 void WmShellMus::OnDidDestroyClient(ui::WindowTreeClient* client) { | 425 void WmShellMus::OnDidDestroyClient(ui::WindowTreeClient* client) { |
| 423 DCHECK_EQ(window_tree_client(), client); | 426 DCHECK_EQ(window_tree_client(), client); |
| 424 client->RemoveObserver(this); | 427 client->RemoveObserver(this); |
| 425 } | 428 } |
| 426 | 429 |
| 427 } // namespace mus | 430 } // namespace mus |
| 428 } // namespace ash | 431 } // namespace ash |
| OLD | NEW |