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 339 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
350 } | 350 } |
351 | 351 |
352 void WmShellMus::AddDisplayObserver(WmDisplayObserver* observer) { | 352 void WmShellMus::AddDisplayObserver(WmDisplayObserver* observer) { |
353 NOTIMPLEMENTED(); | 353 NOTIMPLEMENTED(); |
354 } | 354 } |
355 | 355 |
356 void WmShellMus::RemoveDisplayObserver(WmDisplayObserver* observer) { | 356 void WmShellMus::RemoveDisplayObserver(WmDisplayObserver* observer) { |
357 NOTIMPLEMENTED(); | 357 NOTIMPLEMENTED(); |
358 } | 358 } |
359 | 359 |
360 void WmShellMus::AddPointerWatcher(views::PointerWatcher* watcher) { | 360 void WmShellMus::AddPointerWatcher(views::PointerWatcher* watcher, |
| 361 bool wants_moves /* = false*/) { |
361 // TODO(jamescook): Move PointerWatcherDelegateMus to //ash/mus and use here. | 362 // TODO(jamescook): Move PointerWatcherDelegateMus to //ash/mus and use here. |
362 NOTIMPLEMENTED(); | 363 NOTIMPLEMENTED(); |
363 } | 364 } |
364 | 365 |
365 void WmShellMus::RemovePointerWatcher(views::PointerWatcher* watcher) { | 366 void WmShellMus::RemovePointerWatcher(views::PointerWatcher* watcher) { |
366 NOTIMPLEMENTED(); | 367 NOTIMPLEMENTED(); |
367 } | 368 } |
368 | 369 |
369 bool WmShellMus::IsTouchDown() { | 370 bool WmShellMus::IsTouchDown() { |
370 // TODO: implement me, http://crbug.com/634967. | 371 // TODO: implement me, http://crbug.com/634967. |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
403 OnWindowActivated(gained_active, lost_active)); | 404 OnWindowActivated(gained_active, lost_active)); |
404 } | 405 } |
405 | 406 |
406 void WmShellMus::OnDidDestroyClient(ui::WindowTreeClient* client) { | 407 void WmShellMus::OnDidDestroyClient(ui::WindowTreeClient* client) { |
407 DCHECK_EQ(window_tree_client(), client); | 408 DCHECK_EQ(window_tree_client(), client); |
408 client->RemoveObserver(this); | 409 client->RemoveObserver(this); |
409 } | 410 } |
410 | 411 |
411 } // namespace mus | 412 } // namespace mus |
412 } // namespace ash | 413 } // namespace ash |
OLD | NEW |