| Index: chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
|
| diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
|
| index 2be43e7226aed1485f753da9d097cd3b88c7a762..f8b89b012d064c585a6aaeafe1435ca7bc96f1db 100644
|
| --- a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
|
| +++ b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
|
| @@ -223,14 +223,14 @@ bool GetTrackedByWorkspace(Browser* browser) {
|
| #if defined(USE_ASH) && !defined(OS_WIN) // TODO(win_ash)
|
| class ScreenEventGeneratorDelegate : public aura::test::EventGeneratorDelegate {
|
| public:
|
| - explicit ScreenEventGeneratorDelegate(aura::RootWindow* root_window)
|
| + explicit ScreenEventGeneratorDelegate(aura::Window* root_window)
|
| : root_window_(root_window) {}
|
| virtual ~ScreenEventGeneratorDelegate() {}
|
|
|
| // EventGeneratorDelegate overrides:
|
| virtual aura::RootWindow* GetRootWindowAt(
|
| const gfx::Point& point) const OVERRIDE {
|
| - return root_window_;
|
| + return root_window_->GetDispatcher();
|
| }
|
|
|
| virtual aura::client::ScreenPositionClient* GetScreenPositionClient(
|
| @@ -239,7 +239,7 @@ class ScreenEventGeneratorDelegate : public aura::test::EventGeneratorDelegate {
|
| }
|
|
|
| private:
|
| - aura::RootWindow* root_window_;
|
| + aura::Window* root_window_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ScreenEventGeneratorDelegate);
|
| };
|
|
|