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

Side by Side Diff: ash/wm/workspace_controller_unittest.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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "ash/wm/workspace_controller.h" 5 #include "ash/wm/workspace_controller.h"
6 6
7 #include <map> 7 #include <map>
8 8
9 #include "ash/ash_switches.h" 9 #include "ash/ash_switches.h"
10 #include "ash/root_window_controller.h" 10 #include "ash/root_window_controller.h"
(...skipping 1244 matching lines...) Expand 10 before | Expand all | Expand 10 after
1255 class WorkspaceControllerTestDragging 1255 class WorkspaceControllerTestDragging
1256 : public WorkspaceControllerTest, 1256 : public WorkspaceControllerTest,
1257 public testing::WithParamInterface<bool> { 1257 public testing::WithParamInterface<bool> {
1258 public: 1258 public:
1259 WorkspaceControllerTestDragging() {} 1259 WorkspaceControllerTestDragging() {}
1260 virtual ~WorkspaceControllerTestDragging() {} 1260 virtual ~WorkspaceControllerTestDragging() {}
1261 1261
1262 // testing::Test: 1262 // testing::Test:
1263 virtual void SetUp() OVERRIDE { 1263 virtual void SetUp() OVERRIDE {
1264 WorkspaceControllerTest::SetUp(); 1264 WorkspaceControllerTest::SetUp();
1265 if (!docked_windows_enabled()) { 1265 if (docked_windows_enabled()) {
1266 CommandLine::ForCurrentProcess()->AppendSwitch( 1266 CommandLine::ForCurrentProcess()->AppendSwitch(
1267 ash::switches::kAshDisableDockedWindows); 1267 ash::switches::kAshEnableDockedWindows);
1268 } 1268 }
1269 } 1269 }
1270 1270
1271 bool docked_windows_enabled() const { return GetParam(); } 1271 bool docked_windows_enabled() const { return GetParam(); }
1272 1272
1273 private: 1273 private:
1274 DISALLOW_COPY_AND_ASSIGN(WorkspaceControllerTestDragging); 1274 DISALLOW_COPY_AND_ASSIGN(WorkspaceControllerTestDragging);
1275 }; 1275 };
1276 1276
1277 } // namespace 1277 } // namespace
(...skipping 24 matching lines...) Expand all
1302 EXPECT_TRUE(GetWindowOverlapsShelf()); 1302 EXPECT_TRUE(GetWindowOverlapsShelf());
1303 generator.ReleaseLeftButton(); 1303 generator.ReleaseLeftButton();
1304 EXPECT_TRUE(GetWindowOverlapsShelf()); 1304 EXPECT_TRUE(GetWindowOverlapsShelf());
1305 } 1305 }
1306 1306
1307 INSTANTIATE_TEST_CASE_P(DockedOrNot, WorkspaceControllerTestDragging, 1307 INSTANTIATE_TEST_CASE_P(DockedOrNot, WorkspaceControllerTestDragging,
1308 ::testing::Bool()); 1308 ::testing::Bool());
1309 1309
1310 } // namespace internal 1310 } // namespace internal
1311 } // namespace ash 1311 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698