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/shell_port_mash.h" | 5 #include "ash/mus/bridge/shell_port_mash.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "ash/accelerators/accelerator_controller.h" | 9 #include "ash/accelerators/accelerator_controller.h" |
10 #include "ash/accelerators/accelerator_controller_delegate_aura.h" | 10 #include "ash/accelerators/accelerator_controller_delegate_aura.h" |
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
140 } | 140 } |
141 | 141 |
142 void ShellPortMash::ShowCursor() { | 142 void ShellPortMash::ShowCursor() { |
143 window_manager_->window_manager_client()->SetCursorVisible(true); | 143 window_manager_->window_manager_client()->SetCursorVisible(true); |
144 } | 144 } |
145 | 145 |
146 void ShellPortMash::HideCursor() { | 146 void ShellPortMash::HideCursor() { |
147 window_manager_->window_manager_client()->SetCursorVisible(false); | 147 window_manager_->window_manager_client()->SetCursorVisible(false); |
148 } | 148 } |
149 | 149 |
| 150 void ShellPortMash::SetCursorSize(ui::CursorSize cursor_size) { |
| 151 window_manager_->window_manager_client()->SetCursorSize(cursor_size); |
| 152 } |
| 153 |
150 void ShellPortMash::SetGlobalOverrideCursor( | 154 void ShellPortMash::SetGlobalOverrideCursor( |
151 base::Optional<ui::CursorData> cursor) { | 155 base::Optional<ui::CursorData> cursor) { |
152 window_manager_->window_manager_client()->SetGlobalOverrideCursor( | 156 window_manager_->window_manager_client()->SetGlobalOverrideCursor( |
153 std::move(cursor)); | 157 std::move(cursor)); |
154 } | 158 } |
155 | 159 |
156 bool ShellPortMash::IsMouseEventsEnabled() { | 160 bool ShellPortMash::IsMouseEventsEnabled() { |
157 // TODO: http://crbug.com/637853 | 161 // TODO: http://crbug.com/637853 |
158 NOTIMPLEMENTED(); | 162 NOTIMPLEMENTED(); |
159 return true; | 163 return true; |
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
397 mash_state_->accelerator_controller_registrar = | 401 mash_state_->accelerator_controller_registrar = |
398 base ::MakeUnique<AcceleratorControllerRegistrar>( | 402 base ::MakeUnique<AcceleratorControllerRegistrar>( |
399 window_manager_, accelerator_namespace_id); | 403 window_manager_, accelerator_namespace_id); |
400 return base::MakeUnique<AcceleratorController>( | 404 return base::MakeUnique<AcceleratorController>( |
401 mash_state_->accelerator_controller_delegate.get(), | 405 mash_state_->accelerator_controller_delegate.get(), |
402 mash_state_->accelerator_controller_registrar.get()); | 406 mash_state_->accelerator_controller_registrar.get()); |
403 } | 407 } |
404 | 408 |
405 } // namespace mus | 409 } // namespace mus |
406 } // namespace ash | 410 } // namespace ash |
OLD | NEW |