ash: Eliminate PointerWatcherDelegate

ash/ash.gyp

 # 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.
 
 {
   'variables': {
     'chromium_code': 1,
     # These files lists are shared with the GN build.
     'ash_sources': [
       'accelerators/accelerator_commands_aura.cc',
@@ skipping 10 matching lines @@
       'accelerators/spoken_feedback_toggler.h',
       'app_list/app_list_presenter_delegate.cc',
       'app_list/app_list_presenter_delegate.h',
       'app_list/app_list_presenter_delegate_factory.cc',
       'app_list/app_list_presenter_delegate_factory.h',
       'ash_export.h',
       'ash_touch_exploration_manager_chromeos.cc',
       'ash_touch_exploration_manager_chromeos.h',
       'aura/aura_layout_manager_adapter.cc',
       'aura/aura_layout_manager_adapter.h',
+      'aura/pointer_watcher_adapter.cc',
+      'aura/pointer_watcher_adapter.h',
       'aura/wm_lookup_aura.cc',
       'aura/wm_lookup_aura.h',
       'aura/wm_root_window_controller_aura.cc',
       'aura/wm_root_window_controller_aura.h',
       'aura/wm_shelf_aura.cc',
       'aura/wm_shelf_aura.h',
       'aura/wm_shell_aura.cc',
       'aura/wm_shell_aura.h',
       'aura/wm_window_aura.cc',
       'aura/wm_window_aura.h',
@@ skipping 60 matching lines @@
       'common/keyboard/keyboard_ui.h',
       'common/keyboard/keyboard_ui_observer.h',
       'common/login_status.h',
       'common/material_design/material_design_controller.cc',
       'common/material_design/material_design_controller.h',
       'common/metrics/gesture_action_type.h',
       'common/metrics/user_metrics_action.h',
       'common/multi_profile_uma.cc',
       'common/multi_profile_uma.h',
       'common/palette_delegate.h',
-      'common/pointer_watcher_delegate.h',
       'common/popup_message.cc',
       'common/popup_message.h',
       'common/root_window_controller_common.cc',
       'common/root_window_controller_common.h',
       'common/scoped_root_window_for_new_windows.cc',
       'common/scoped_root_window_for_new_windows.h',
       'common/session/session_state_delegate.cc',
       'common/session/session_state_delegate.h',
       'common/session/session_state_observer.cc',
       'common/session/session_state_observer.h',
@@ skipping 498 matching lines @@
       'magnifier/partial_magnification_controller.cc',
       'magnifier/partial_magnification_controller.h',
       'metrics/desktop_task_switch_metric_recorder.cc',
       'metrics/desktop_task_switch_metric_recorder.h',
       'metrics/task_switch_metrics_recorder.cc',
       'metrics/task_switch_metrics_recorder.h',
       'metrics/task_switch_time_tracker.cc',
       'metrics/task_switch_time_tracker.h',
       'metrics/user_metrics_recorder.cc',
       'metrics/user_metrics_recorder.h',
-      'pointer_watcher_delegate_aura.cc',
-      'pointer_watcher_delegate_aura.h',
       'root_window_controller.cc',
       'root_window_controller.h',
       'root_window_settings.cc',
       'root_window_settings.h',
       'rotator/screen_rotation_animation.cc',
       'rotator/screen_rotation_animation.h',
       'rotator/screen_rotation_animator.cc',
       'rotator/screen_rotation_animator.h',
       'rotator/window_rotation.cc',
       'rotator/window_rotation.h',
@@ skipping 286 matching lines @@
       'shell/content/shell_content_state_impl.h',
     ],
     'ash_unittests_sources': [
       'accelerators/accelerator_commands_unittest.cc',
       'accelerators/accelerator_controller_unittest.cc',
       'accelerators/accelerator_filter_unittest.cc',
       'accelerators/magnifier_key_scroller_unittest.cc',
       'accelerators/spoken_feedback_toggler_unittest.cc',
       'app_list/app_list_presenter_delegate_unittest.cc',
       'ash_touch_exploration_manager_chromeos_unittest.cc',
+      'aura/pointer_watcher_adapter_unittest.cc',
       'autoclick/autoclick_unittest.cc',
       'common/accelerators/accelerator_table_unittest.cc',
       'common/display/display_info_unittest.cc',
       'common/frame/caption_buttons/frame_caption_button_container_view_unittest.cc',
       'common/frame/custom_frame_view_ash_unittest.cc',
       'common/frame/default_header_painter_unittest.cc',
       'common/material_design/material_design_controller_unittest.cc',
       'common/popup_message_unittest.cc',
       'common/shelf/shelf_background_animator_unittest.cc',
       'common/shelf/shelf_button_pressed_metric_tracker_unittest.cc',
@@ skipping 46 matching lines @@
       'drag_drop/drag_drop_tracker_unittest.cc',
       'extended_desktop_unittest.cc',
       'focus_cycler_unittest.cc',
       'frame/caption_buttons/frame_size_button_unittest.cc',
       'host/ash_window_tree_host_x11_unittest.cc',
       'magnifier/magnification_controller_unittest.cc',
       'metrics/desktop_task_switch_metric_recorder_unittest.cc',
       'metrics/task_switch_metrics_recorder_unittest.cc',
       'metrics/task_switch_time_tracker_unittest.cc',
       'metrics/user_metrics_recorder_unittest.cc',
-      'pointer_watcher_delegate_aura_unittest.cc',
       'root_window_controller_unittest.cc',
       'rotator/screen_rotation_animation_unittest.cc',
       'screen_util_unittest.cc',
       'shelf/shelf_layout_manager_unittest.cc',
       'shelf/shelf_unittest.cc',
       'shelf/shelf_view_unittest.cc',
       'shelf/shelf_widget_unittest.cc',
       'shell_unittest.cc',
       'sticky_keys/sticky_keys_overlay_unittest.cc',
       'sticky_keys/sticky_keys_unittest.cc',
@@ skipping 485 matching lines @@
                   '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
                 ],
               }
             ],
           ],
         },
       ],
     }],
   ],
 }