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

Side by Side Diff: ash/wm/dock/docked_window_resizer_unittest.cc

Issue 123743003: Re-enables docked windows by default in M34 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 11 months 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 (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/root_window_controller.h" 8 #include "ash/root_window_controller.h"
9 #include "ash/screen_ash.h" 9 #include "ash/screen_ash.h"
10 #include "ash/shelf/shelf.h" 10 #include "ash/shelf/shelf.h"
(...skipping 27 matching lines...) Expand all
38 namespace internal { 38 namespace internal {
39 39
40 class DockedWindowResizerTest 40 class DockedWindowResizerTest
41 : public test::AshTestBase, 41 : public test::AshTestBase,
42 public testing::WithParamInterface<ui::wm::WindowType> { 42 public testing::WithParamInterface<ui::wm::WindowType> {
43 public: 43 public:
44 DockedWindowResizerTest() : model_(NULL), window_type_(GetParam()) {} 44 DockedWindowResizerTest() : model_(NULL), window_type_(GetParam()) {}
45 virtual ~DockedWindowResizerTest() {} 45 virtual ~DockedWindowResizerTest() {}
46 46
47 virtual void SetUp() OVERRIDE { 47 virtual void SetUp() OVERRIDE {
48 CommandLine::ForCurrentProcess()->AppendSwitch(
49 ash::switches::kAshEnableDockedWindows);
50 AshTestBase::SetUp(); 48 AshTestBase::SetUp();
51 UpdateDisplay("600x400"); 49 UpdateDisplay("600x400");
52 test::ShellTestApi test_api(Shell::GetInstance()); 50 test::ShellTestApi test_api(Shell::GetInstance());
53 model_ = test_api.shelf_model(); 51 model_ = test_api.shelf_model();
54 } 52 }
55 53
56 virtual void TearDown() OVERRIDE { 54 virtual void TearDown() OVERRIDE {
57 AshTestBase::TearDown(); 55 AshTestBase::TearDown();
58 } 56 }
59 57
(...skipping 1367 matching lines...) Expand 10 before | Expand all | Expand 10 after
1427 EXPECT_TRUE(window_state->IsSnapped()); 1425 EXPECT_TRUE(window_state->IsSnapped());
1428 } 1426 }
1429 1427
1430 // Tests run twice - on both panels and normal windows 1428 // Tests run twice - on both panels and normal windows
1431 INSTANTIATE_TEST_CASE_P(NormalOrPanel, 1429 INSTANTIATE_TEST_CASE_P(NormalOrPanel,
1432 DockedWindowResizerTest, 1430 DockedWindowResizerTest,
1433 testing::Values(ui::wm::WINDOW_TYPE_NORMAL, 1431 testing::Values(ui::wm::WINDOW_TYPE_NORMAL,
1434 ui::wm::WINDOW_TYPE_PANEL)); 1432 ui::wm::WINDOW_TYPE_PANEL));
1435 } // namespace internal 1433 } // namespace internal
1436 } // namespace ash 1434 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/dock/docked_window_layout_manager_unittest.cc ('k') | ash/wm/system_gesture_event_filter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698