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 <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "ash/wm/window_state.h" | 9 #include "ash/wm/window_state.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
205 return false; | 205 return false; |
206 #else | 206 #else |
207 return ash::wm::GetWindowState(browser->window()->GetNativeWindow())-> | 207 return ash::wm::GetWindowState(browser->window()->GetNativeWindow())-> |
208 is_dragged(); | 208 is_dragged(); |
209 #endif | 209 #endif |
210 } | 210 } |
211 | 211 |
212 } // namespace | 212 } // namespace |
213 | 213 |
214 #if defined(USE_ASH) && !defined(OS_WIN) // TODO(win_ash) | 214 #if defined(USE_ASH) && !defined(OS_WIN) // TODO(win_ash) |
215 class ScreenEventGeneratorDelegate : public aura::test::EventGeneratorDelegate { | 215 class ScreenEventGeneratorDelegate |
| 216 : public aura::test::EventGeneratorDelegateAura { |
216 public: | 217 public: |
217 explicit ScreenEventGeneratorDelegate(aura::Window* root_window) | 218 explicit ScreenEventGeneratorDelegate(aura::Window* root_window) |
218 : root_window_(root_window) {} | 219 : root_window_(root_window) {} |
219 virtual ~ScreenEventGeneratorDelegate() {} | 220 virtual ~ScreenEventGeneratorDelegate() {} |
220 | 221 |
221 // EventGeneratorDelegate overrides: | 222 // EventGeneratorDelegate overrides: |
222 virtual aura::WindowTreeHost* GetHostAt( | 223 virtual aura::WindowTreeHost* GetHostAt( |
223 const gfx::Point& point) const OVERRIDE { | 224 const gfx::Point& point) const OVERRIDE { |
224 return root_window_->GetHost(); | 225 return root_window_->GetHost(); |
225 } | 226 } |
(...skipping 1977 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2203 DetachToBrowserTabDragControllerTest, | 2204 DetachToBrowserTabDragControllerTest, |
2204 ::testing::Values("mouse", "touch")); | 2205 ::testing::Values("mouse", "touch")); |
2205 INSTANTIATE_TEST_CASE_P(TabDragging, | 2206 INSTANTIATE_TEST_CASE_P(TabDragging, |
2206 DetachToBrowserTabDragControllerTestTouch, | 2207 DetachToBrowserTabDragControllerTestTouch, |
2207 ::testing::Values("touch")); | 2208 ::testing::Values("touch")); |
2208 #elif defined(USE_ASH) | 2209 #elif defined(USE_ASH) |
2209 INSTANTIATE_TEST_CASE_P(TabDragging, | 2210 INSTANTIATE_TEST_CASE_P(TabDragging, |
2210 DetachToBrowserTabDragControllerTest, | 2211 DetachToBrowserTabDragControllerTest, |
2211 ::testing::Values("mouse")); | 2212 ::testing::Values("mouse")); |
2212 #endif | 2213 #endif |
OLD | NEW |