| Index: ash/focus_cycler.cc
|
| diff --git a/ash/focus_cycler.cc b/ash/focus_cycler.cc
|
| index 4927bfecfdf99e61640454505c4d3c64751365d4..24126d814b120a5aaf7a13b4f6a09a149b81f52a 100644
|
| --- a/ash/focus_cycler.cc
|
| +++ b/ash/focus_cycler.cc
|
| @@ -9,7 +9,6 @@
|
| #include "ash/wm/widget_finder.h"
|
| #include "ash/wm/window_state.h"
|
| #include "ash/wm/window_util.h"
|
| -#include "ash/wm_window.h"
|
| #include "ui/views/accessible_pane_view.h"
|
| #include "ui/views/focus/focus_search.h"
|
| #include "ui/views/widget/widget.h"
|
| @@ -40,9 +39,9 @@ void FocusCycler::RemoveWidget(views::Widget* widget) {
|
| }
|
|
|
| void FocusCycler::RotateFocus(Direction direction) {
|
| - WmWindow* window = WmWindow::Get(wm::GetActiveWindow());
|
| + aura::Window* window = wm::GetActiveWindow();
|
| if (window) {
|
| - views::Widget* widget = GetInternalWidgetForWindow(window->aura_window());
|
| + views::Widget* widget = GetInternalWidgetForWindow(window);
|
| // First try to rotate focus within the active widget. If that succeeds,
|
| // we're done.
|
| if (widget &&
|
| @@ -85,9 +84,9 @@ void FocusCycler::RotateFocus(Direction direction) {
|
| Shell::Get()->mru_window_tracker()->BuildMruWindowList());
|
| if (mru_windows.empty())
|
| break;
|
| - WmWindow* window = mru_windows.front();
|
| - window->GetWindowState()->Activate();
|
| - views::Widget* widget = GetInternalWidgetForWindow(window->aura_window());
|
| + auto* window = mru_windows.front();
|
| + wm::GetWindowState(window)->Activate();
|
| + views::Widget* widget = GetInternalWidgetForWindow(window);
|
| if (!widget)
|
| break;
|
| views::FocusManager* focus_manager = widget->GetFocusManager();
|
|
|