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

Unified Diff: ash/focus_cycler.cc

Issue 2042913002: Converts MruWindowTracker to work with common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: not equal Created 4 years, 6 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/common/wm_window_observer.h ('k') | ash/mus/bridge/wm_shell_mus.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/focus_cycler.cc
diff --git a/ash/focus_cycler.cc b/ash/focus_cycler.cc
index 6b26930193ed788f9be7cb9ea8a188a03849f92f..f2492e3f8843c8dcea5e75dca2749dd11b729599 100644
--- a/ash/focus_cycler.cc
+++ b/ash/focus_cycler.cc
@@ -4,6 +4,7 @@
#include "ash/focus_cycler.h"
+#include "ash/aura/wm_window_aura.h"
#include "ash/common/wm/window_state.h"
#include "ash/shell.h"
#include "ash/wm/mru_window_tracker.h"
@@ -87,9 +88,10 @@ void FocusCycler::RotateFocus(Direction direction) {
Shell::GetInstance()->mru_window_tracker()->BuildMruWindowList());
if (mru_windows.empty())
break;
- aura::Window* window = mru_windows.front();
- wm::GetWindowState(window)->Activate();
- views::Widget* widget = views::Widget::GetWidgetForNativeWindow(window);
+ WmWindow* window = mru_windows.front();
+ window->GetWindowState()->Activate();
+ views::Widget* widget = views::Widget::GetWidgetForNativeWindow(
+ WmWindowAura::GetAuraWindow(window));
if (!widget)
break;
views::FocusManager* focus_manager = widget->GetFocusManager();
« no previous file with comments | « ash/common/wm_window_observer.h ('k') | ash/mus/bridge/wm_shell_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698