ash/common/wm/window_positioning_utils.cc - Issue 2787363002: Moves couple of WmShell methods to standalone functions

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/common/wm/window_positioning_utils.cc

Issue 2787363002: Moves couple of WmShell methods to standalone functions (Closed)

Patch Set: feedback and fix applist Created 3 years, 9 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/common/wm/window_positioning_utils.cc

diff --git a/ash/common/wm/window_positioning_utils.cc b/ash/common/wm/window_positioning_utils.cc

index b865c5071a78c89458ad177c6dff6e84273796a5..88e32466842938507f6789f38be65dcd97435fff 100644

--- a/ash/common/wm/window_positioning_utils.cc

+++ b/ash/common/wm/window_positioning_utils.cc

@@ -14,6 +14,7 @@

#include "ash/common/wm_window.h"

#include "ash/root_window_controller.h"

#include "ash/shell.h"

+#include "ash/wm/window_util.h"

#include "ui/aura/window_tracker.h"

#include "ui/display/display.h"

#include "ui/display/types/display_constants.h"

@@ -153,8 +154,8 @@ void SetBoundsInScreen(WmWindow* window,

}

if (dst_container && window->GetParent() != dst_container) {

- WmWindow* focused = WmShell::Get()->GetFocusedWindow();

- WmWindow* active = WmShell::Get()->GetActiveWindow();

+ WmWindow* focused = WmWindow::Get(GetFocusedWindow());

+ WmWindow* active = WmWindow::Get(GetActiveWindow());

aura::WindowTracker tracker;

if (focused)