| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/panel_layout_manager.h" | 5 #include "ash/wm/panel_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/shell.h" | 9 #include "ash/shell.h" |
| 10 #include "ash/shell_window_ids.h" | 10 #include "ash/shell_window_ids.h" |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 namespace internal { | 23 namespace internal { |
| 24 | 24 |
| 25 using aura::test::WindowIsAbove; | 25 using aura::test::WindowIsAbove; |
| 26 | 26 |
| 27 class PanelLayoutManagerTest : public ash::test::AshTestBase { | 27 class PanelLayoutManagerTest : public ash::test::AshTestBase { |
| 28 public: | 28 public: |
| 29 PanelLayoutManagerTest() {} | 29 PanelLayoutManagerTest() {} |
| 30 virtual ~PanelLayoutManagerTest() {} | 30 virtual ~PanelLayoutManagerTest() {} |
| 31 | 31 |
| 32 virtual void SetUp() OVERRIDE { | 32 virtual void SetUp() OVERRIDE { |
| 33 CommandLine::ForCurrentProcess()->AppendSwitch(switches::kAuraPanelManager); | |
| 34 ash::test::AshTestBase::SetUp(); | 33 ash::test::AshTestBase::SetUp(); |
| 35 ASSERT_TRUE(ash::test::TestLauncherDelegate::instance()); | 34 ASSERT_TRUE(ash::test::TestLauncherDelegate::instance()); |
| 36 | 35 |
| 37 Launcher* launcher = Shell::GetInstance()->launcher(); | 36 Launcher* launcher = Shell::GetInstance()->launcher(); |
| 38 launcher_view_test_.reset(new test::LauncherViewTestAPI( | 37 launcher_view_test_.reset(new test::LauncherViewTestAPI( |
| 39 launcher->GetLauncherViewForTest())); | 38 launcher->GetLauncherViewForTest())); |
| 40 launcher_view_test_->SetAnimationDuration(1); | 39 launcher_view_test_->SetAnimationDuration(1); |
| 41 } | 40 } |
| 42 | 41 |
| 43 aura::Window* CreateNormalWindow() { | 42 aura::Window* CreateNormalWindow() { |
| (...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 254 wm::ActivateWindow(w2.get()); | 253 wm::ActivateWindow(w2.get()); |
| 255 // Windows should be stacked 1 < 2 > 3 | 254 // Windows should be stacked 1 < 2 > 3 |
| 256 w1.reset(); | 255 w1.reset(); |
| 257 EXPECT_NO_FATAL_FAILURE(IsPanelAboveLauncherIcon(w2.get())); | 256 EXPECT_NO_FATAL_FAILURE(IsPanelAboveLauncherIcon(w2.get())); |
| 258 EXPECT_NO_FATAL_FAILURE(IsPanelAboveLauncherIcon(w3.get())); | 257 EXPECT_NO_FATAL_FAILURE(IsPanelAboveLauncherIcon(w3.get())); |
| 259 EXPECT_TRUE(WindowIsAbove(w2.get(), w3.get())); | 258 EXPECT_TRUE(WindowIsAbove(w2.get(), w3.get())); |
| 260 } | 259 } |
| 261 | 260 |
| 262 } // namespace internal | 261 } // namespace internal |
| 263 } // namespace ash | 262 } // namespace ash |
| OLD | NEW |