Chromium Code Reviews| Index: ash/wm/overview/window_selector.cc |
| diff --git a/ash/wm/overview/window_selector.cc b/ash/wm/overview/window_selector.cc |
| index 71c1ef9d979cf500c094aec0710967d718cd85c2..070c0bb2807f91ad56087add76e8a3e7ca74b4fd 100644 |
| --- a/ash/wm/overview/window_selector.cc |
| +++ b/ash/wm/overview/window_selector.cc |
| @@ -268,7 +268,7 @@ void WindowSelector::Init(const WindowList& windows) { |
| // Hide the callout widgets for panels. It is safe to call this for |
| // root windows that don't contain any panel windows. |
| - PanelLayoutManager::Get(WmWindow::Get(root))->SetShowCalloutWidgets(false); |
| + PanelLayoutManager::Get(root)->SetShowCalloutWidgets(false); |
| std::unique_ptr<WindowGrid> grid(new WindowGrid(root, windows, this)); |
| if (grid->empty()) |
| @@ -337,8 +337,7 @@ void WindowSelector::Shutdown() { |
| ResetFocusRestoreWindow(true); |
| RemoveAllObservers(); |
| - std::vector<WmWindow*> root_windows = ShellPort::Get()->GetAllRootWindows(); |
| - for (WmWindow* window : root_windows) { |
| + for (aura::Window* window : Shell::Get()->GetAllRootWindows()) { |
|
msw
2017/05/24 17:50:58
optional nit: GetAllRootWindows is static
sky
2017/05/24 17:59:13
Done.
|
| // Un-hide the callout widgets for panels. It is safe to call this for |
| // root_windows that don't contain any panel windows. |
| PanelLayoutManager::Get(window)->SetShowCalloutWidgets(true); |