| 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_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/root_window_controller.h" | 8 #include "ash/root_window_controller.h" | 
| 9 #include "ash/shelf/shelf.h" | 9 #include "ash/shelf/shelf.h" | 
| 10 #include "ash/shelf/shelf_layout_manager.h" | 10 #include "ash/shelf/shelf_layout_manager.h" | 
| (...skipping 26 matching lines...) Expand all  Loading... | 
| 37 | 37 | 
| 38 namespace ash { | 38 namespace ash { | 
| 39 | 39 | 
| 40 class DockedWindowLayoutManagerTest | 40 class DockedWindowLayoutManagerTest | 
| 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   DockedWindowLayoutManagerTest() : window_type_(GetParam()) {} | 44   DockedWindowLayoutManagerTest() : window_type_(GetParam()) {} | 
| 45   virtual ~DockedWindowLayoutManagerTest() {} | 45   virtual ~DockedWindowLayoutManagerTest() {} | 
| 46 | 46 | 
| 47   virtual void SetUp() OVERRIDE { | 47   virtual void SetUp() override { | 
| 48     AshTestBase::SetUp(); | 48     AshTestBase::SetUp(); | 
| 49     UpdateDisplay("600x600"); | 49     UpdateDisplay("600x600"); | 
| 50     ASSERT_TRUE(test::TestShelfDelegate::instance()); | 50     ASSERT_TRUE(test::TestShelfDelegate::instance()); | 
| 51 | 51 | 
| 52     shelf_view_test_.reset(new test::ShelfViewTestAPI( | 52     shelf_view_test_.reset(new test::ShelfViewTestAPI( | 
| 53         test::ShelfTestAPI(Shelf::ForPrimaryDisplay()).shelf_view())); | 53         test::ShelfTestAPI(Shelf::ForPrimaryDisplay()).shelf_view())); | 
| 54     shelf_view_test_->SetAnimationDuration(1); | 54     shelf_view_test_->SetAnimationDuration(1); | 
| 55   } | 55   } | 
| 56 | 56 | 
| 57  protected: | 57  protected: | 
| (...skipping 773 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 831   EXPECT_EQ(work_area.height(), window->GetBoundsInScreen().height()); | 831   EXPECT_EQ(work_area.height(), window->GetBoundsInScreen().height()); | 
| 832 } | 832 } | 
| 833 | 833 | 
| 834 // Tests run twice - on both panels and normal windows | 834 // Tests run twice - on both panels and normal windows | 
| 835 INSTANTIATE_TEST_CASE_P(NormalOrPanel, | 835 INSTANTIATE_TEST_CASE_P(NormalOrPanel, | 
| 836                         DockedWindowLayoutManagerTest, | 836                         DockedWindowLayoutManagerTest, | 
| 837                         testing::Values(ui::wm::WINDOW_TYPE_NORMAL, | 837                         testing::Values(ui::wm::WINDOW_TYPE_NORMAL, | 
| 838                                         ui::wm::WINDOW_TYPE_PANEL)); | 838                                         ui::wm::WINDOW_TYPE_PANEL)); | 
| 839 | 839 | 
| 840 }  // namespace ash | 840 }  // namespace ash | 
| OLD | NEW | 
|---|