Linux Aura: Fixes and improvements for cursor loader

ui/views/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//testing/test.gni")
 import("//ui/ozone/ozone.gni")
 
 config("flags") {
@@ skipping 426 matching lines @@
       "linux_ui/window_button_order_provider.cc",
     ]
   }
 
   if (is_chromeos) {
     sources -= [
       "controls/menu/menu_config_linux.cc",
       "linux_ui/status_icon_linux.cc",
       "linux_ui/status_icon_linux.h",
     ]
-    sources += [
-      "widget/desktop_aura/desktop_cursor_loader_updater_chromeos.cc",
-      "widget/desktop_aura/desktop_window_tree_host_chromeos.cc",
-    ]
+    sources += [ "widget/desktop_aura/desktop_window_tree_host_chromeos.cc" ]
   }
 
   if (is_win) {
     sources += [
       "widget/widget_hwnd_utils.cc",
       "widget/widget_hwnd_utils.h",
       "win/fullscreen_handler.cc",
       "win/fullscreen_handler.h",
       "win/hwnd_message_handler.cc",
       "win/hwnd_message_handler.h",
@@ skipping 71 matching lines @@
       "native_cursor_aura.cc",
       "touchui/touch_selection_controller_impl.cc",
       "touchui/touch_selection_controller_impl.h",
       "touchui/touch_selection_menu_runner_views.cc",
       "touchui/touch_selection_menu_runner_views.h",
       "view_constants_aura.cc",
       "view_constants_aura.h",
       "views_touch_selection_controller_factory_aura.cc",
       "widget/desktop_aura/desktop_capture_client.cc",
       "widget/desktop_aura/desktop_capture_client.h",
-      "widget/desktop_aura/desktop_cursor_loader_updater.h",
       "widget/desktop_aura/desktop_drop_target_win.cc",
       "widget/desktop_aura/desktop_drop_target_win.h",
       "widget/desktop_aura/desktop_event_client.cc",
       "widget/desktop_aura/desktop_event_client.h",
       "widget/desktop_aura/desktop_focus_rules.cc",
       "widget/desktop_aura/desktop_focus_rules.h",
       "widget/desktop_aura/desktop_native_cursor_manager.cc",
       "widget/desktop_aura/desktop_native_cursor_manager.h",
       "widget/desktop_aura/desktop_native_widget_aura.cc",
       "widget/desktop_aura/desktop_native_widget_aura.h",
       "widget/desktop_aura/desktop_screen.h",
       "widget/desktop_aura/desktop_screen_position_client.cc",
       "widget/desktop_aura/desktop_screen_position_client.h",
       "widget/desktop_aura/desktop_window_tree_host.h",
       "widget/focus_manager_event_handler.cc",
       "widget/focus_manager_event_handler.h",
       "widget/native_widget_aura.cc",
       "widget/native_widget_aura.h",
       "widget/tooltip_manager_aura.cc",
       "widget/tooltip_manager_aura.h",
       "widget/window_reorderer.cc",
       "widget/window_reorderer.h",
     ]
     deps += [
       "//ui/aura",
       "//ui/touch_selection",
       "//ui/wm",
     ]
     if (!is_chromeos) {
+      sources += []

[sadrul, 2016/11/17 16:17:03]

?

[Tom (Use chromium acct), 2016/11/17 19:17:48]

oops, left over from rebasing
removed

       if (use_x11) {
         sources += [
           "widget/desktop_aura/desktop_drag_drop_client_aurax11.cc",
           "widget/desktop_aura/desktop_drag_drop_client_aurax11.h",
           "widget/desktop_aura/desktop_screen_x11.cc",
           "widget/desktop_aura/desktop_screen_x11.h",
           "widget/desktop_aura/desktop_window_tree_host_x11.cc",
           "widget/desktop_aura/desktop_window_tree_host_x11.h",
           "widget/desktop_aura/x11_desktop_handler.cc",
           "widget/desktop_aura/x11_desktop_handler.h",
@@ skipping 13 matching lines @@
         ]
         if (use_atk) {
           sources += [
             "accessibility/native_view_accessibility_auralinux.cc",
             "accessibility/native_view_accessibility_auralinux.h",
           ]
           configs += [ "//build/config/linux/atk" ]
         }
       } else if (is_win) {
         sources += [
-          "widget/desktop_aura/desktop_cursor_loader_updater_aurawin.cc",
           "widget/desktop_aura/desktop_drag_drop_client_win.cc",
           "widget/desktop_aura/desktop_drag_drop_client_win.h",
           "widget/desktop_aura/desktop_screen_win.cc",
           "widget/desktop_aura/desktop_screen_win.h",
           "widget/desktop_aura/desktop_window_tree_host_win.cc",
           "widget/desktop_aura/desktop_window_tree_host_win.h",
         ]
       } else if (use_ozone) {
         sources += [
           "widget/desktop_aura/desktop_factory_ozone.cc",
           "widget/desktop_aura/desktop_factory_ozone.h",
           "widget/desktop_aura/desktop_screen_ozone.cc",
           "widget/desktop_aura/desktop_window_tree_host_ozone.cc",
         ]
       }
       if (is_linux) {
-        sources += [
-          "style/platform_style_linux.cc",
-          "widget/desktop_aura/desktop_cursor_loader_updater_auralinux.cc",
-          "widget/desktop_aura/desktop_cursor_loader_updater_auralinux.h",
-        ]
+        sources += [ "style/platform_style_linux.cc" ]
       }
     }
   }
 
   if (is_mac) {
     deps += [
       "//ui/accelerated_widget_mac",
       "//ui/events:dom_keycode_converter",
     ]
     libs = [
@@ skipping 385 matching lines @@
       "//ui/base:test_support",
       "//ui/compositor",
       "//ui/events:test_support",
       "//ui/gl:test_support",
       "//ui/resources",
       "//ui/resources:ui_test_pak",
       "//ui/strings",
     ]
   }
 }