aura: Use the default high-dpi cursor for unsupported cursors.

ui/aura/root_window_host_linux.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/aura/root_window_host_linux.h"
 
 #include <X11/Xatom.h>
 #include <X11/Xcursor/Xcursor.h>
 #include <X11/Xlib.h>
 #include <X11/cursorfont.h>
@@ skipping 1014 matching lines @@
 }
 
 bool RootWindowHostLinux::IsWindowManagerPresent() {
   // Per ICCCM 2.8, "Manager Selections", window managers should take ownership
   // of WM_Sn selections (where n is a screen number).
   return XGetSelectionOwner(
       xdisplay_, atom_cache_.GetAtom("WM_S0")) != None;
 }
 
 void RootWindowHostLinux::SetCursorInternal(gfx::NativeCursor cursor) {
-  ::Cursor xcursor =
-      image_cursors_->IsImageCursor(cursor) ?
-      image_cursors_->ImageCursorFromNative(cursor) :
-      (cursor == ui::kCursorNone ? invisible_cursor_ :
-       (cursor == ui::kCursorCustom ? cursor.platform() :
-        ui::GetXCursor(CursorShapeFromNative(cursor))));
+  ::Cursor xcursor;
+  if (image_cursors_->IsImageCursor(cursor))
+    xcursor = image_cursors_->ImageCursorFromNative(cursor);
+  else if (cursor == ui::kCursorNone)
+    xcursor =  invisible_cursor_;
+  else if (cursor == ui::kCursorCustom)
+    xcursor = cursor.platform();
+  else if (delegate_->GetDeviceScaleFactor() == 1.0)
+    xcursor = ui::GetXCursor(CursorShapeFromNative(cursor));
+  else
+    xcursor = image_cursors_->ImageCursorFromNative(ui::kCursorPointer);
   XDefineCursor(xdisplay_, xwindow_, xcursor);
 }
 
 // static
 RootWindowHost* RootWindowHost::Create(RootWindowHostDelegate* delegate,
                                        const gfx::Rect& bounds) {
   return new RootWindowHostLinux(delegate, bounds);
 }
 
 // static
 RootWindowHost* RootWindowHost::GetForAcceleratedWidget(
     gfx::AcceleratedWidget accelerated_widget) {
   return reinterpret_cast<RootWindowHost*>(
       ui::ViewProp::GetValue(accelerated_widget, kRootWindowHostLinuxKey));
 }
 
 // static
 gfx::Size RootWindowHost::GetNativeScreenSize() {
   ::Display* xdisplay = base::MessagePumpAuraX11::GetDefaultXDisplay();
   return gfx::Size(DisplayWidth(xdisplay, 0), DisplayHeight(xdisplay, 0));
 }
 
 }  // namespace aura