| 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/launcher/launcher_model.h" | 9 #include "ash/launcher/launcher_model.h" |
| 10 #include "ash/root_window_controller.h" | 10 #include "ash/root_window_controller.h" |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 namespace internal { | 36 namespace internal { |
| 37 | 37 |
| 38 class DockedWindowResizerTest | 38 class DockedWindowResizerTest |
| 39 : public test::AshTestBase, | 39 : public test::AshTestBase, |
| 40 public testing::WithParamInterface<aura::client::WindowType> { | 40 public testing::WithParamInterface<aura::client::WindowType> { |
| 41 public: | 41 public: |
| 42 DockedWindowResizerTest() : model_(NULL), window_type_(GetParam()) {} | 42 DockedWindowResizerTest() : model_(NULL), window_type_(GetParam()) {} |
| 43 virtual ~DockedWindowResizerTest() {} | 43 virtual ~DockedWindowResizerTest() {} |
| 44 | 44 |
| 45 virtual void SetUp() OVERRIDE { | 45 virtual void SetUp() OVERRIDE { |
| 46 CommandLine::ForCurrentProcess()->AppendSwitch( | |
| 47 ash::switches::kAshEnableStickyEdges); | |
| 48 CommandLine::ForCurrentProcess()->AppendSwitch( | |
| 49 ash::switches::kAshEnableDockedWindows); | |
| 50 AshTestBase::SetUp(); | 46 AshTestBase::SetUp(); |
| 51 UpdateDisplay("600x400"); | 47 UpdateDisplay("600x400"); |
| 52 test::ShellTestApi test_api(Shell::GetInstance()); | 48 test::ShellTestApi test_api(Shell::GetInstance()); |
| 53 model_ = test_api.launcher_model(); | 49 model_ = test_api.launcher_model(); |
| 54 } | 50 } |
| 55 | 51 |
| 56 virtual void TearDown() OVERRIDE { | 52 virtual void TearDown() OVERRIDE { |
| 57 AshTestBase::TearDown(); | 53 AshTestBase::TearDown(); |
| 58 } | 54 } |
| 59 | 55 |
| (...skipping 1093 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1153 child->GetBoundsInScreen().origin().ToString()); | 1149 child->GetBoundsInScreen().origin().ToString()); |
| 1154 } | 1150 } |
| 1155 | 1151 |
| 1156 // Tests run twice - on both panels and normal windows | 1152 // Tests run twice - on both panels and normal windows |
| 1157 INSTANTIATE_TEST_CASE_P(NormalOrPanel, | 1153 INSTANTIATE_TEST_CASE_P(NormalOrPanel, |
| 1158 DockedWindowResizerTest, | 1154 DockedWindowResizerTest, |
| 1159 testing::Values(aura::client::WINDOW_TYPE_NORMAL, | 1155 testing::Values(aura::client::WINDOW_TYPE_NORMAL, |
| 1160 aura::client::WINDOW_TYPE_PANEL)); | 1156 aura::client::WINDOW_TYPE_PANEL)); |
| 1161 } // namespace internal | 1157 } // namespace internal |
| 1162 } // namespace ash | 1158 } // namespace ash |
| OLD | NEW |