| Index: ui/aura/desktop/desktop_cursor_client.cc
|
| diff --git a/ui/aura/desktop/desktop_cursor_client.cc b/ui/aura/desktop/desktop_cursor_client.cc
|
| index 70bb4aaf82c28d02b63892d5fc31d726dbfb58a6..7077483f3657a83ed9ce0d01dd7f48c09b607fed 100644
|
| --- a/ui/aura/desktop/desktop_cursor_client.cc
|
| +++ b/ui/aura/desktop/desktop_cursor_client.cc
|
| @@ -5,17 +5,20 @@
|
| #include "ui/aura/desktop/desktop_cursor_client.h"
|
|
|
| #include "ui/aura/root_window.h"
|
| +#include "ui/base/cursor/cursor_loader.h"
|
|
|
| namespace aura {
|
|
|
| DesktopCursorClient::DesktopCursorClient(aura::RootWindow* window)
|
| - : root_window_(window) {
|
| + : root_window_(window),
|
| + cursor_loader_(ui::CursorLoader::Create()) {
|
| }
|
|
|
| DesktopCursorClient::~DesktopCursorClient() {
|
| }
|
|
|
| void DesktopCursorClient::SetCursor(gfx::NativeCursor cursor) {
|
| + cursor_loader_->SetPlatformCursor(&cursor);
|
| root_window_->SetCursor(cursor);
|
| }
|
|
|
| @@ -28,7 +31,8 @@ bool DesktopCursorClient::IsCursorVisible() const {
|
| }
|
|
|
| void DesktopCursorClient::SetDeviceScaleFactor(float device_scale_factor) {
|
| - // TODO(ben|erg): Use the device scale factor set here for the cursor.
|
| + cursor_loader_->UnloadAll();
|
| + cursor_loader_->set_device_scale_factor(device_scale_factor);
|
| }
|
|
|
| } // namespace aura
|
|
|