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/aura/shell_port_classic.h" | 5 #include "ash/aura/shell_port_classic.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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
78 } | 78 } |
79 | 79 |
80 void ShellPortClassic::ShowCursor() { | 80 void ShellPortClassic::ShowCursor() { |
81 Shell::Get()->cursor_manager()->ShowCursor(); | 81 Shell::Get()->cursor_manager()->ShowCursor(); |
82 } | 82 } |
83 | 83 |
84 void ShellPortClassic::HideCursor() { | 84 void ShellPortClassic::HideCursor() { |
85 Shell::Get()->cursor_manager()->HideCursor(); | 85 Shell::Get()->cursor_manager()->HideCursor(); |
86 } | 86 } |
87 | 87 |
| 88 void ShellPortClassic::SetCursorSize(ui::CursorSize cursor_size) { |
| 89 Shell::Get()->cursor_manager()->SetCursorSize(cursor_size); |
| 90 } |
| 91 |
88 void ShellPortClassic::SetGlobalOverrideCursor( | 92 void ShellPortClassic::SetGlobalOverrideCursor( |
89 base::Optional<ui::CursorData> cursor) { | 93 base::Optional<ui::CursorData> cursor) { |
90 // This is part of a fat interface that is only implemented on the mash side; | 94 // This is part of a fat interface that is only implemented on the mash side; |
91 // there isn't an equivalent operation in ::wm::CursorManager. We also can't | 95 // there isn't an equivalent operation in ::wm::CursorManager. We also can't |
92 // just call into ShellPortMash because of library linking issues. | 96 // just call into ShellPortMash because of library linking issues. |
93 NOTREACHED(); | 97 NOTREACHED(); |
94 } | 98 } |
95 | 99 |
96 bool ShellPortClassic::IsMouseEventsEnabled() { | 100 bool ShellPortClassic::IsMouseEventsEnabled() { |
97 return Shell::Get()->cursor_manager()->IsMouseEventsEnabled(); | 101 return Shell::Get()->cursor_manager()->IsMouseEventsEnabled(); |
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
197 std::unique_ptr<AcceleratorController> | 201 std::unique_ptr<AcceleratorController> |
198 ShellPortClassic::CreateAcceleratorController() { | 202 ShellPortClassic::CreateAcceleratorController() { |
199 DCHECK(!accelerator_controller_delegate_); | 203 DCHECK(!accelerator_controller_delegate_); |
200 accelerator_controller_delegate_ = | 204 accelerator_controller_delegate_ = |
201 base::MakeUnique<AcceleratorControllerDelegateAura>(); | 205 base::MakeUnique<AcceleratorControllerDelegateAura>(); |
202 return base::MakeUnique<AcceleratorController>( | 206 return base::MakeUnique<AcceleratorController>( |
203 accelerator_controller_delegate_.get(), nullptr); | 207 accelerator_controller_delegate_.get(), nullptr); |
204 } | 208 } |
205 | 209 |
206 } // namespace ash | 210 } // namespace ash |
OLD | NEW |