OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h" | 5 #include "chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h" |
6 | 6 |
7 #include "ash/wm/window_state.h" | 7 #include "ash/wm/window_state.h" |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/callback.h" | 9 #include "base/callback.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
215 #if defined(USE_ASH) && !defined(OS_WIN) // TODO(win_ash) | 215 #if defined(USE_ASH) && !defined(OS_WIN) // TODO(win_ash) |
216 class ScreenEventGeneratorDelegate : public aura::test::EventGeneratorDelegate { | 216 class ScreenEventGeneratorDelegate : public aura::test::EventGeneratorDelegate { |
217 public: | 217 public: |
218 explicit ScreenEventGeneratorDelegate(aura::Window* root_window) | 218 explicit ScreenEventGeneratorDelegate(aura::Window* root_window) |
219 : root_window_(root_window) {} | 219 : root_window_(root_window) {} |
220 virtual ~ScreenEventGeneratorDelegate() {} | 220 virtual ~ScreenEventGeneratorDelegate() {} |
221 | 221 |
222 // EventGeneratorDelegate overrides: | 222 // EventGeneratorDelegate overrides: |
223 virtual aura::WindowEventDispatcher* GetDispatcherAt( | 223 virtual aura::WindowEventDispatcher* GetDispatcherAt( |
224 const gfx::Point& point) const OVERRIDE { | 224 const gfx::Point& point) const OVERRIDE { |
225 return root_window_->GetDispatcher(); | 225 return root_window_->GetHost()->dispatcher(); |
226 } | 226 } |
227 | 227 |
228 virtual aura::client::ScreenPositionClient* GetScreenPositionClient( | 228 virtual aura::client::ScreenPositionClient* GetScreenPositionClient( |
229 const aura::Window* window) const OVERRIDE { | 229 const aura::Window* window) const OVERRIDE { |
230 return aura::client::GetScreenPositionClient(root_window_); | 230 return aura::client::GetScreenPositionClient(root_window_); |
231 } | 231 } |
232 | 232 |
233 private: | 233 private: |
234 aura::Window* root_window_; | 234 aura::Window* root_window_; |
235 | 235 |
(...skipping 2096 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2332 DetachToDockedTabDragControllerTest, | 2332 DetachToDockedTabDragControllerTest, |
2333 ::testing::Values("mouse", "mouse docked")); | 2333 ::testing::Values("mouse", "mouse docked")); |
2334 INSTANTIATE_TEST_CASE_P(TabDragging, | 2334 INSTANTIATE_TEST_CASE_P(TabDragging, |
2335 DetachToBrowserTabDragControllerTestTouch, | 2335 DetachToBrowserTabDragControllerTestTouch, |
2336 ::testing::Values("touch", "touch docked")); | 2336 ::testing::Values("touch", "touch docked")); |
2337 #else | 2337 #else |
2338 INSTANTIATE_TEST_CASE_P(TabDragging, | 2338 INSTANTIATE_TEST_CASE_P(TabDragging, |
2339 DetachToBrowserTabDragControllerTest, | 2339 DetachToBrowserTabDragControllerTest, |
2340 ::testing::Values("mouse")); | 2340 ::testing::Values("mouse")); |
2341 #endif | 2341 #endif |
OLD | NEW |