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

Side by Side Diff: ash/wm/dock/docked_window_layout_manager_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 (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_layout_manager.h" 5 #include "ash/wm/dock/docked_window_layout_manager.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 28 matching lines...) Expand all
39 namespace internal { 39 namespace internal {
40 40
41 class DockedWindowLayoutManagerTest 41 class DockedWindowLayoutManagerTest
42 : public test::AshTestBase, 42 : public test::AshTestBase,
43 public testing::WithParamInterface<aura::client::WindowType> { 43 public testing::WithParamInterface<aura::client::WindowType> {
44 public: 44 public:
45 DockedWindowLayoutManagerTest() : window_type_(GetParam()) {} 45 DockedWindowLayoutManagerTest() : window_type_(GetParam()) {}
46 virtual ~DockedWindowLayoutManagerTest() {} 46 virtual ~DockedWindowLayoutManagerTest() {}
47 47
48 virtual void SetUp() OVERRIDE { 48 virtual void SetUp() OVERRIDE {
49 CommandLine::ForCurrentProcess()->AppendSwitch(
50 ash::switches::kAshEnableDockedWindows);
49 AshTestBase::SetUp(); 51 AshTestBase::SetUp();
50 UpdateDisplay("600x600"); 52 UpdateDisplay("600x600");
51 ASSERT_TRUE(test::TestLauncherDelegate::instance()); 53 ASSERT_TRUE(test::TestLauncherDelegate::instance());
52 54
53 shelf_view_test_.reset(new test::ShelfViewTestAPI( 55 shelf_view_test_.reset(new test::ShelfViewTestAPI(
54 test::LauncherTestAPI(Launcher::ForPrimaryDisplay()).shelf_view())); 56 test::LauncherTestAPI(Launcher::ForPrimaryDisplay()).shelf_view()));
55 shelf_view_test_->SetAnimationDuration(1); 57 shelf_view_test_->SetAnimationDuration(1);
56 } 58 }
57 59
58 protected: 60 protected:
(...skipping 749 matching lines...) Expand 10 before | Expand all | Expand 10 after
808 EXPECT_LT(w2->GetBoundsInScreen().height(), work_area.height() / 2 - 10); 810 EXPECT_LT(w2->GetBoundsInScreen().height(), work_area.height() / 2 - 10);
809 } 811 }
810 812
811 // Tests run twice - on both panels and normal windows 813 // Tests run twice - on both panels and normal windows
812 INSTANTIATE_TEST_CASE_P(NormalOrPanel, 814 INSTANTIATE_TEST_CASE_P(NormalOrPanel,
813 DockedWindowLayoutManagerTest, 815 DockedWindowLayoutManagerTest,
814 testing::Values(aura::client::WINDOW_TYPE_NORMAL, 816 testing::Values(aura::client::WINDOW_TYPE_NORMAL,
815 aura::client::WINDOW_TYPE_PANEL)); 817 aura::client::WINDOW_TYPE_PANEL));
816 } // namespace internal 818 } // namespace internal
817 } // namespace ash 819 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698