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

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

Issue 109663002: Disables docked windows by default in M33 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years 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
« ash/ash_switches.cc ('K') | « 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 348 matching lines...) Expand 10 before | Expand all | Expand 10 after
359 359
360 class DetachToBrowserTabDragControllerTest 360 class DetachToBrowserTabDragControllerTest
361 : public TabDragControllerTest, 361 : public TabDragControllerTest,
362 public ::testing::WithParamInterface<const char*> { 362 public ::testing::WithParamInterface<const char*> {
363 public: 363 public:
364 DetachToBrowserTabDragControllerTest() {} 364 DetachToBrowserTabDragControllerTest() {}
365 365
366 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 366 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
367 command_line->AppendSwitch(switches::kTabBrowserDragging); 367 command_line->AppendSwitch(switches::kTabBrowserDragging);
368 #if defined(USE_ASH) && !defined(OS_WIN) // TODO(win_ash) 368 #if defined(USE_ASH) && !defined(OS_WIN) // TODO(win_ash)
369 if (!docked_windows_enabled()) { 369 if (docked_windows_enabled()) {
370 CommandLine::ForCurrentProcess()->AppendSwitch( 370 CommandLine::ForCurrentProcess()->AppendSwitch(
371 ash::switches::kAshDisableDockedWindows); 371 ash::switches::kAshEnableDockedWindows);
372 } 372 }
373 #endif 373 #endif
374 } 374 }
375 375
376 virtual void SetUpOnMainThread() OVERRIDE { 376 virtual void SetUpOnMainThread() OVERRIDE {
377 #if defined(USE_ASH) && !defined(OS_WIN) // TODO(win_ash) 377 #if defined(USE_ASH) && !defined(OS_WIN) // TODO(win_ash)
378 event_generator_.reset(new aura::test::EventGenerator( 378 event_generator_.reset(new aura::test::EventGenerator(
379 ash::Shell::GetPrimaryRootWindow())); 379 ash::Shell::GetPrimaryRootWindow()));
380 #endif 380 #endif
381 } 381 }
(...skipping 1805 matching lines...) Expand 10 before | Expand all | Expand 10 after
2187 DetachToDockedTabDragControllerTest, 2187 DetachToDockedTabDragControllerTest,
2188 ::testing::Values("mouse", "mouse docked")); 2188 ::testing::Values("mouse", "mouse docked"));
2189 INSTANTIATE_TEST_CASE_P(TabDragging, 2189 INSTANTIATE_TEST_CASE_P(TabDragging,
2190 DetachToBrowserTabDragControllerTestTouch, 2190 DetachToBrowserTabDragControllerTestTouch,
2191 ::testing::Values("touch", "touch docked")); 2191 ::testing::Values("touch", "touch docked"));
2192 #else 2192 #else
2193 INSTANTIATE_TEST_CASE_P(TabDragging, 2193 INSTANTIATE_TEST_CASE_P(TabDragging,
2194 DetachToBrowserTabDragControllerTest, 2194 DetachToBrowserTabDragControllerTest,
2195 ::testing::Values("mouse")); 2195 ::testing::Values("mouse"));
2196 #endif 2196 #endif
OLDNEW
« ash/ash_switches.cc ('K') | « chrome/browser/about_flags.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698