Chromium Code Reviews| Index: ash/wm/panels/panel_window_resizer.cc |
| diff --git a/ash/wm/panels/panel_window_resizer.cc b/ash/wm/panels/panel_window_resizer.cc |
| index 1425485cc485804a6ea6be039e5c9dad4d89e7e0..c53e43417154ffb278daf829f22664a3329c9777 100644 |
| --- a/ash/wm/panels/panel_window_resizer.cc |
| +++ b/ash/wm/panels/panel_window_resizer.cc |
| @@ -67,7 +67,7 @@ void PanelWindowResizer::Drag(const gfx::Point& location, int event_flags) { |
| // The panel's parent already knows that the drag is in progress for this |
| // panel. |
| if (panel_container_ && GetTarget()->parent() != panel_container_) |
| - GetPanelLayoutManager()->StartDragging(WmWindow::Get(GetTarget())); |
| + GetPanelLayoutManager()->StartDragging(GetTarget()); |
| } |
| gfx::Point offset; |
| gfx::Rect bounds(CalculateBoundsForDrag(location)); |
| @@ -156,7 +156,7 @@ void PanelWindowResizer::StartedDragging() { |
| // Tell the panel layout manager that we are dragging this panel before |
| // attaching it so that it does not get repositioned. |
| if (panel_container_) |
| - GetPanelLayoutManager()->StartDragging(WmWindow::Get(GetTarget())); |
| + GetPanelLayoutManager()->StartDragging(GetTarget()); |
| if (!was_attached_) { |
| // Attach the panel while dragging, placing it in front of other panels. |
| aura::Window* target = GetTarget(); |
| @@ -192,8 +192,7 @@ void PanelWindowResizer::FinishDragging() { |
| // but then canceled the drag we may need to inform the original layout |
| // manager that the drag is finished. |
| if (initial_panel_container_ != panel_container_) { |
|
msw
2017/05/24 17:50:58
optional nit: curlies not needed
sky
2017/05/24 17:59:13
Done.
|
| - PanelLayoutManager::Get(WmWindow::Get(initial_panel_container_)) |
| - ->FinishDragging(); |
| + PanelLayoutManager::Get(initial_panel_container_)->FinishDragging(); |
| } |
| if (panel_container_) |
| GetPanelLayoutManager()->FinishDragging(); |
| @@ -207,7 +206,7 @@ void PanelWindowResizer::UpdateLauncherPosition() { |
| } |
| PanelLayoutManager* PanelWindowResizer::GetPanelLayoutManager() { |
| - return PanelLayoutManager::Get(WmWindow::Get(panel_container_)); |
| + return PanelLayoutManager::Get(panel_container_); |
| } |
| } // namespace ash |