Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(31)

Side by Side Diff: chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc

Issue 55363004: Enables docked windows by default (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Enables docked window flag by default (nit) Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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 1797 matching lines...) Expand 10 before | Expand all | Expand 10 after
2154 DetachToDockedTabDragControllerTest, 2154 DetachToDockedTabDragControllerTest,
2155 ::testing::Values("mouse", "mouse docked")); 2155 ::testing::Values("mouse", "mouse docked"));
2156 INSTANTIATE_TEST_CASE_P(TabDragging, 2156 INSTANTIATE_TEST_CASE_P(TabDragging,
2157 DetachToBrowserTabDragControllerTestTouch, 2157 DetachToBrowserTabDragControllerTestTouch,
2158 ::testing::Values("touch", "touch docked")); 2158 ::testing::Values("touch", "touch docked"));
2159 #else 2159 #else
2160 INSTANTIATE_TEST_CASE_P(TabDragging, 2160 INSTANTIATE_TEST_CASE_P(TabDragging,
2161 DetachToBrowserTabDragControllerTest, 2161 DetachToBrowserTabDragControllerTest,
2162 ::testing::Values("mouse")); 2162 ::testing::Values("mouse"));
2163 #endif 2163 #endif
OLDNEW
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698