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

Unified Diff: ash/wm/panels/panel_layout_manager_unittest.cc

Issue 1918883002: Makes Panel related classes use ash/wm/common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@phantom_window_controller
Patch Set: feedback Created 4 years, 8 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/panels/panel_layout_manager.cc ('k') | ash/wm/panels/panel_window_resizer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/panels/panel_layout_manager_unittest.cc
diff --git a/ash/wm/panels/panel_layout_manager_unittest.cc b/ash/wm/panels/panel_layout_manager_unittest.cc
index 1e742b607e7318a48b9c755ae5705dd29e25e051..686ffa81ffc6b25283496912295befdf096b26e1 100644
--- a/ash/wm/panels/panel_layout_manager_unittest.cc
+++ b/ash/wm/panels/panel_layout_manager_unittest.cc
@@ -80,16 +80,15 @@ class PanelLayoutManagerTest : public test::AshTestBase {
}
views::Widget* GetCalloutWidgetForPanel(aura::Window* panel) {
- PanelLayoutManager* manager =
- static_cast<PanelLayoutManager*>(GetPanelContainer(panel)->
- layout_manager());
+ wm::WmWindow* wm_panel = wm::WmWindowAura::Get(panel);
+ PanelLayoutManager* manager = PanelLayoutManager::Get(wm_panel);
DCHECK(manager);
- PanelLayoutManager::PanelList::iterator found = std::find(
- manager->panel_windows_.begin(), manager->panel_windows_.end(),
- panel);
+ PanelLayoutManager::PanelList::iterator found =
+ std::find(manager->panel_windows_.begin(),
+ manager->panel_windows_.end(), wm_panel);
DCHECK(found != manager->panel_windows_.end());
DCHECK(found->callout_widget);
- return reinterpret_cast<views::Widget*>(found->callout_widget);
+ return found->CalloutWidget();
}
void PanelInScreen(aura::Window* panel) {
« no previous file with comments | « ash/wm/panels/panel_layout_manager.cc ('k') | ash/wm/panels/panel_window_resizer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698