OLD | NEW |
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 1235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1246 class WorkspaceControllerTestDragging | 1246 class WorkspaceControllerTestDragging |
1247 : public WorkspaceControllerTest, | 1247 : public WorkspaceControllerTest, |
1248 public testing::WithParamInterface<bool> { | 1248 public testing::WithParamInterface<bool> { |
1249 public: | 1249 public: |
1250 WorkspaceControllerTestDragging() {} | 1250 WorkspaceControllerTestDragging() {} |
1251 virtual ~WorkspaceControllerTestDragging() {} | 1251 virtual ~WorkspaceControllerTestDragging() {} |
1252 | 1252 |
1253 // testing::Test: | 1253 // testing::Test: |
1254 virtual void SetUp() OVERRIDE { | 1254 virtual void SetUp() OVERRIDE { |
1255 WorkspaceControllerTest::SetUp(); | 1255 WorkspaceControllerTest::SetUp(); |
1256 if (docked_windows_enabled()) { | 1256 if (!docked_windows_enabled()) { |
1257 CommandLine::ForCurrentProcess()->AppendSwitch( | 1257 CommandLine::ForCurrentProcess()->AppendSwitch( |
1258 ash::switches::kAshEnableDockedWindows); | 1258 ash::switches::kAshDisableDockedWindows); |
1259 } | 1259 } |
1260 } | 1260 } |
1261 | 1261 |
1262 bool docked_windows_enabled() const { return GetParam(); } | 1262 bool docked_windows_enabled() const { return GetParam(); } |
1263 | 1263 |
1264 private: | 1264 private: |
1265 DISALLOW_COPY_AND_ASSIGN(WorkspaceControllerTestDragging); | 1265 DISALLOW_COPY_AND_ASSIGN(WorkspaceControllerTestDragging); |
1266 }; | 1266 }; |
1267 | 1267 |
1268 } // namespace | 1268 } // namespace |
(...skipping 26 matching lines...) Expand all Loading... |
1295 EXPECT_TRUE(GetWindowOverlapsShelf()); | 1295 EXPECT_TRUE(GetWindowOverlapsShelf()); |
1296 generator.ReleaseLeftButton(); | 1296 generator.ReleaseLeftButton(); |
1297 EXPECT_TRUE(GetWindowOverlapsShelf()); | 1297 EXPECT_TRUE(GetWindowOverlapsShelf()); |
1298 } | 1298 } |
1299 | 1299 |
1300 INSTANTIATE_TEST_CASE_P(DockedOrNot, WorkspaceControllerTestDragging, | 1300 INSTANTIATE_TEST_CASE_P(DockedOrNot, WorkspaceControllerTestDragging, |
1301 ::testing::Bool()); | 1301 ::testing::Bool()); |
1302 | 1302 |
1303 } // namespace internal | 1303 } // namespace internal |
1304 } // namespace ash | 1304 } // namespace ash |
OLD | NEW |