ash/wm/ash_focus_rules.cc - Issue 2115663002: Folds methods in WmShellCommon to WmShell

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/wm/ash_focus_rules.cc

Issue 2115663002: Folds methods in WmShellCommon to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: merge 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:

Index: ash/wm/ash_focus_rules.cc

diff --git a/ash/wm/ash_focus_rules.cc b/ash/wm/ash_focus_rules.cc

index 929c3ace52fecfc1ba54a834ed27a4f4f4ca2fa2..e6e1c63f4c68545623cda4d1952d08a0d766b42c 100644

--- a/ash/wm/ash_focus_rules.cc

+++ b/ash/wm/ash_focus_rules.cc

@@ -80,7 +80,7 @@ aura::Window* AshFocusRules::GetNextActivatableWindow(

// Start from the container of the most-recently-used window. If the list of

// MRU windows is empty, then start from the container of the window that just

// lost focus |ignore|.

- ash::MruWindowTracker* mru = ash::Shell::GetInstance()->mru_window_tracker();

+ MruWindowTracker* mru = WmShell::Get()->mru_window_tracker();

std::vector<WmWindow*> windows = mru->BuildMruWindowList();

aura::Window* starting_window =

windows.empty() ? ignore : WmWindowAura::GetAuraWindow(windows[0]);