| 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 379 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 390 bool WmShellMus::IsTouchDown() { | 390 bool WmShellMus::IsTouchDown() { |
| 391 // TODO: implement me, http://crbug.com/634967. | 391 // TODO: implement me, http://crbug.com/634967. |
| 392 // NOTIMPLEMENTED is too spammy here. | 392 // NOTIMPLEMENTED is too spammy here. |
| 393 return false; | 393 return false; |
| 394 } | 394 } |
| 395 | 395 |
| 396 #if defined(OS_CHROMEOS) | 396 #if defined(OS_CHROMEOS) |
| 397 void WmShellMus::ToggleIgnoreExternalKeyboard() { | 397 void WmShellMus::ToggleIgnoreExternalKeyboard() { |
| 398 NOTIMPLEMENTED(); | 398 NOTIMPLEMENTED(); |
| 399 } | 399 } |
| 400 |
| 401 void WmShellMus::SetLaserPointerEnabled(bool enabled) { |
| 402 NOTIMPLEMENTED(); |
| 403 } |
| 400 #endif // defined(OS_CHROMEOS) | 404 #endif // defined(OS_CHROMEOS) |
| 401 | 405 |
| 402 ui::WindowTreeClient* WmShellMus::window_tree_client() { | 406 ui::WindowTreeClient* WmShellMus::window_tree_client() { |
| 403 return window_manager_->window_tree_client(); | 407 return window_manager_->window_tree_client(); |
| 404 } | 408 } |
| 405 | 409 |
| 406 // static | 410 // static |
| 407 bool WmShellMus::IsActivationParent(ui::Window* window) { | 411 bool WmShellMus::IsActivationParent(ui::Window* window) { |
| 408 return window && IsActivatableShellWindowId( | 412 return window && IsActivatableShellWindowId( |
| 409 WmWindowMus::Get(window)->GetShellWindowId()); | 413 WmWindowMus::Get(window)->GetShellWindowId()); |
| (...skipping 14 matching lines...) Expand all Loading... |
| 424 OnWindowActivated(gained_active, lost_active)); | 428 OnWindowActivated(gained_active, lost_active)); |
| 425 } | 429 } |
| 426 | 430 |
| 427 void WmShellMus::OnDidDestroyClient(ui::WindowTreeClient* client) { | 431 void WmShellMus::OnDidDestroyClient(ui::WindowTreeClient* client) { |
| 428 DCHECK_EQ(window_tree_client(), client); | 432 DCHECK_EQ(window_tree_client(), client); |
| 429 client->RemoveObserver(this); | 433 client->RemoveObserver(this); |
| 430 } | 434 } |
| 431 | 435 |
| 432 } // namespace mus | 436 } // namespace mus |
| 433 } // namespace ash | 437 } // namespace ash |
| OLD | NEW |