| 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 323 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 334 | 334 |
| 335 class DetachToBrowserTabDragControllerTest | 335 class DetachToBrowserTabDragControllerTest |
| 336 : public TabDragControllerTest, | 336 : public TabDragControllerTest, |
| 337 public ::testing::WithParamInterface<const char*> { | 337 public ::testing::WithParamInterface<const char*> { |
| 338 public: | 338 public: |
| 339 DetachToBrowserTabDragControllerTest() {} | 339 DetachToBrowserTabDragControllerTest() {} |
| 340 | 340 |
| 341 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { | 341 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
| 342 command_line->AppendSwitch(switches::kTabBrowserDragging); | 342 command_line->AppendSwitch(switches::kTabBrowserDragging); |
| 343 #if defined(USE_ASH) && !defined(OS_WIN) // TODO(win_ash) | 343 #if defined(USE_ASH) && !defined(OS_WIN) // TODO(win_ash) |
| 344 if (docked_windows_enabled()) { | 344 if (!docked_windows_enabled()) { |
| 345 CommandLine::ForCurrentProcess()->AppendSwitch( | 345 CommandLine::ForCurrentProcess()->AppendSwitch( |
| 346 ash::switches::kAshEnableDockedWindows); | 346 ash::switches::kAshDisableDockedWindows); |
| 347 } | 347 } |
| 348 #endif | 348 #endif |
| 349 } | 349 } |
| 350 | 350 |
| 351 virtual void SetUpOnMainThread() OVERRIDE { | 351 virtual void SetUpOnMainThread() OVERRIDE { |
| 352 #if defined(USE_ASH) && !defined(OS_WIN) // TODO(win_ash) | 352 #if defined(USE_ASH) && !defined(OS_WIN) // TODO(win_ash) |
| 353 event_generator_.reset(new aura::test::EventGenerator( | 353 event_generator_.reset(new aura::test::EventGenerator( |
| 354 ash::Shell::GetPrimaryRootWindow())); | 354 ash::Shell::GetPrimaryRootWindow())); |
| 355 #endif | 355 #endif |
| 356 } | 356 } |
| (...skipping 1798 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2155 DetachToDockedTabDragControllerTest, | 2155 DetachToDockedTabDragControllerTest, |
| 2156 ::testing::Values("mouse", "mouse docked")); | 2156 ::testing::Values("mouse", "mouse docked")); |
| 2157 INSTANTIATE_TEST_CASE_P(TabDragging, | 2157 INSTANTIATE_TEST_CASE_P(TabDragging, |
| 2158 DetachToBrowserTabDragControllerTestTouch, | 2158 DetachToBrowserTabDragControllerTestTouch, |
| 2159 ::testing::Values("touch", "touch docked")); | 2159 ::testing::Values("touch", "touch docked")); |
| 2160 #else | 2160 #else |
| 2161 INSTANTIATE_TEST_CASE_P(TabDragging, | 2161 INSTANTIATE_TEST_CASE_P(TabDragging, |
| 2162 DetachToBrowserTabDragControllerTest, | 2162 DetachToBrowserTabDragControllerTest, |
| 2163 ::testing::Values("mouse")); | 2163 ::testing::Values("mouse")); |
| 2164 #endif | 2164 #endif |
| OLD | NEW |