OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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/dock/docked_window_resizer.h" | 5 #include "ash/wm/dock/docked_window_resizer.h" |
6 | 6 |
7 #include "ash/ash_switches.h" | 7 #include "ash/ash_switches.h" |
8 #include "ash/launcher/launcher.h" | 8 #include "ash/launcher/launcher.h" |
9 #include "ash/root_window_controller.h" | 9 #include "ash/root_window_controller.h" |
10 #include "ash/screen_ash.h" | 10 #include "ash/screen_ash.h" |
(...skipping 26 matching lines...) Expand all Loading... |
37 namespace internal { | 37 namespace internal { |
38 | 38 |
39 class DockedWindowResizerTest | 39 class DockedWindowResizerTest |
40 : public test::AshTestBase, | 40 : public test::AshTestBase, |
41 public testing::WithParamInterface<aura::client::WindowType> { | 41 public testing::WithParamInterface<aura::client::WindowType> { |
42 public: | 42 public: |
43 DockedWindowResizerTest() : model_(NULL), window_type_(GetParam()) {} | 43 DockedWindowResizerTest() : model_(NULL), window_type_(GetParam()) {} |
44 virtual ~DockedWindowResizerTest() {} | 44 virtual ~DockedWindowResizerTest() {} |
45 | 45 |
46 virtual void SetUp() OVERRIDE { | 46 virtual void SetUp() OVERRIDE { |
| 47 CommandLine::ForCurrentProcess()->AppendSwitch( |
| 48 ash::switches::kAshEnableDockedWindows); |
47 AshTestBase::SetUp(); | 49 AshTestBase::SetUp(); |
48 UpdateDisplay("600x400"); | 50 UpdateDisplay("600x400"); |
49 test::ShellTestApi test_api(Shell::GetInstance()); | 51 test::ShellTestApi test_api(Shell::GetInstance()); |
50 model_ = test_api.shelf_model(); | 52 model_ = test_api.shelf_model(); |
51 } | 53 } |
52 | 54 |
53 virtual void TearDown() OVERRIDE { | 55 virtual void TearDown() OVERRIDE { |
54 AshTestBase::TearDown(); | 56 AshTestBase::TearDown(); |
55 } | 57 } |
56 | 58 |
(...skipping 1302 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1359 EXPECT_TRUE(window_state->IsSnapped()); | 1361 EXPECT_TRUE(window_state->IsSnapped()); |
1360 } | 1362 } |
1361 | 1363 |
1362 // Tests run twice - on both panels and normal windows | 1364 // Tests run twice - on both panels and normal windows |
1363 INSTANTIATE_TEST_CASE_P(NormalOrPanel, | 1365 INSTANTIATE_TEST_CASE_P(NormalOrPanel, |
1364 DockedWindowResizerTest, | 1366 DockedWindowResizerTest, |
1365 testing::Values(aura::client::WINDOW_TYPE_NORMAL, | 1367 testing::Values(aura::client::WINDOW_TYPE_NORMAL, |
1366 aura::client::WINDOW_TYPE_PANEL)); | 1368 aura::client::WINDOW_TYPE_PANEL)); |
1367 } // namespace internal | 1369 } // namespace internal |
1368 } // namespace ash | 1370 } // namespace ash |
OLD | NEW |