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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
46 aura::Window* CreatePanelWindow(const gfx::Rect& bounds) { | 46 aura::Window* CreatePanelWindow(const gfx::Rect& bounds) { |
47 aura::Window* window = aura::test::CreateTestWindowWithDelegateAndType( | 47 aura::Window* window = aura::test::CreateTestWindowWithDelegateAndType( |
48 NULL, | 48 NULL, |
49 aura::client::WINDOW_TYPE_PANEL, | 49 aura::client::WINDOW_TYPE_PANEL, |
50 0, | 50 0, |
51 bounds, | 51 bounds, |
52 NULL /* parent should automatically become GetPanelContainer */); | 52 NULL /* parent should automatically become GetPanelContainer */); |
53 ash::test::TestLauncherDelegate* launcher_delegate = | 53 ash::test::TestLauncherDelegate* launcher_delegate = |
54 ash::test::TestLauncherDelegate::instance(); | 54 ash::test::TestLauncherDelegate::instance(); |
55 launcher_delegate->AddLauncherItem(window); | 55 launcher_delegate->AddLauncherItem(window); |
| 56 PanelLayoutManager* manager = |
| 57 static_cast<PanelLayoutManager*>(GetPanelContainer()->layout_manager()); |
| 58 manager->Relayout(); |
56 return window; | 59 return window; |
57 } | 60 } |
58 | 61 |
59 aura::Window* GetPanelContainer() { | 62 aura::Window* GetPanelContainer() { |
60 return Shell::GetContainer( | 63 return Shell::GetContainer( |
61 Shell::GetPrimaryRootWindow(), | 64 Shell::GetPrimaryRootWindow(), |
62 ash::internal::kShellWindowId_PanelContainer); | 65 ash::internal::kShellWindowId_PanelContainer); |
63 } | 66 } |
64 | 67 |
65 void GetCalloutWidget(views::Widget** widget) { | 68 void GetCalloutWidget(views::Widget** widget) { |
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
253 wm::ActivateWindow(w2.get()); | 256 wm::ActivateWindow(w2.get()); |
254 // Windows should be stacked 1 < 2 > 3 | 257 // Windows should be stacked 1 < 2 > 3 |
255 w1.reset(); | 258 w1.reset(); |
256 EXPECT_NO_FATAL_FAILURE(IsPanelAboveLauncherIcon(w2.get())); | 259 EXPECT_NO_FATAL_FAILURE(IsPanelAboveLauncherIcon(w2.get())); |
257 EXPECT_NO_FATAL_FAILURE(IsPanelAboveLauncherIcon(w3.get())); | 260 EXPECT_NO_FATAL_FAILURE(IsPanelAboveLauncherIcon(w3.get())); |
258 EXPECT_TRUE(WindowIsAbove(w2.get(), w3.get())); | 261 EXPECT_TRUE(WindowIsAbove(w2.get(), w3.get())); |
259 } | 262 } |
260 | 263 |
261 } // namespace internal | 264 } // namespace internal |
262 } // namespace ash | 265 } // namespace ash |
OLD | NEW |