Index: ash/wm/overview/window_selector_unittest.cc |
diff --git a/ash/wm/overview/window_selector_unittest.cc b/ash/wm/overview/window_selector_unittest.cc |
index f82e5904cc5d5d051f9c20d57d01066d20da895a..ff576ecf6deb3a52398e532fbf150efd2e488b88 100644 |
--- a/ash/wm/overview/window_selector_unittest.cc |
+++ b/ash/wm/overview/window_selector_unittest.cc |
@@ -1537,25 +1537,29 @@ TEST_F(WindowSelectorTest, SelectWindowWithReturnKey) { |
TEST_F(WindowSelectorTest, WindowOverviewHidesCalloutWidgets) { |
std::unique_ptr<aura::Window> panel1( |
CreatePanelWindow(gfx::Rect(0, 0, 100, 100))); |
- WmWindow* wm_panel1 = WmWindow::Get(panel1.get()); |
std::unique_ptr<aura::Window> panel2( |
CreatePanelWindow(gfx::Rect(0, 0, 100, 100))); |
- WmWindow* wm_panel2 = WmWindow::Get(panel2.get()); |
- PanelLayoutManager* panel_manager = PanelLayoutManager::Get(wm_panel1); |
+ PanelLayoutManager* panel_manager = PanelLayoutManager::Get(panel1.get()); |
// By default, panel callout widgets are visible. |
- EXPECT_TRUE(panel_manager->GetCalloutWidgetForPanel(wm_panel1)->IsVisible()); |
- EXPECT_TRUE(panel_manager->GetCalloutWidgetForPanel(wm_panel2)->IsVisible()); |
+ EXPECT_TRUE( |
+ panel_manager->GetCalloutWidgetForPanel(panel1.get())->IsVisible()); |
+ EXPECT_TRUE( |
+ panel_manager->GetCalloutWidgetForPanel(panel2.get())->IsVisible()); |
// Toggling the overview should hide the callout widgets. |
ToggleOverview(); |
- EXPECT_FALSE(panel_manager->GetCalloutWidgetForPanel(wm_panel1)->IsVisible()); |
- EXPECT_FALSE(panel_manager->GetCalloutWidgetForPanel(wm_panel2)->IsVisible()); |
+ EXPECT_FALSE( |
+ panel_manager->GetCalloutWidgetForPanel(panel1.get())->IsVisible()); |
+ EXPECT_FALSE( |
+ panel_manager->GetCalloutWidgetForPanel(panel2.get())->IsVisible()); |
// Ending the overview should show them again. |
ToggleOverview(); |
- EXPECT_TRUE(panel_manager->GetCalloutWidgetForPanel(wm_panel1)->IsVisible()); |
- EXPECT_TRUE(panel_manager->GetCalloutWidgetForPanel(wm_panel2)->IsVisible()); |
+ EXPECT_TRUE( |
+ panel_manager->GetCalloutWidgetForPanel(panel1.get())->IsVisible()); |
+ EXPECT_TRUE( |
+ panel_manager->GetCalloutWidgetForPanel(panel2.get())->IsVisible()); |
} |
// Creates three windows and tests filtering them by title. |