Changes ScreenMusDelegate::GetWindowAtScreenPoint to return aura::Window

ui/views/mus/window_manager_connection.h

 // Copyright 2015 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.
 
 #ifndef UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_
 #define UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 76 matching lines @@
   const std::set<ui::Window*>& GetRoots() const;
 
  private:
   friend class test::WindowManagerConnectionTestApi;
 
   WindowManagerConnection(
       service_manager::Connector* connector,
       const service_manager::Identity& identity,
       scoped_refptr<base::SingleThreadTaskRunner> task_runner);
 
+  // Exposed for tests.
+  ui::Window* GetUiWindowAtScreenPoint(const gfx::Point& point);
+
   // ui::WindowTreeClientDelegate:
   void OnEmbed(ui::Window* root) override;
   void OnLostConnection(ui::WindowTreeClient* client) override;
   void OnEmbedRootDestroyed(ui::Window* root) override;
   void OnPointerEventObserved(const ui::PointerEvent& event,
                               ui::Window* target) override;
 
   // ScreenMusDelegate:
   void OnWindowManagerFrameValuesChanged() override;
   gfx::Point GetCursorScreenPoint() override;
-  ui::Window* GetWindowAtScreenPoint(const gfx::Point& point) override;
+  aura::Window* GetWindowAtScreenPoint(const gfx::Point& point) override;
 
   // ui:OSExchangeDataProviderFactory::Factory:
   std::unique_ptr<OSExchangeData::Provider> BuildProvider() override;
 
   service_manager::Connector* connector_;
   service_manager::Identity identity_;
   std::unique_ptr<ScreenMus> screen_;
   std::unique_ptr<ui::WindowTreeClient> client_;
   std::unique_ptr<ui::GpuService> gpu_service_;
   std::unique_ptr<PointerWatcherEventRouter> pointer_watcher_event_router_;
   std::unique_ptr<SurfaceContextFactory> compositor_context_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowManagerConnection);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_