ash/wm/stacking_controller.cc - Issue 1898223002: Removes most aura dependencies from WindowResizer

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/stacking_controller.cc

Issue 1898223002: Removes most aura dependencies from WindowResizer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_aura_from_window_state

Patch Set: nit and merge Created 4 years, 8 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

Index: ash/wm/stacking_controller.cc

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

index 21b631027c0552387a50ca1177b30b37b213b93c..e5626944ebf7cdddd117c4aaa9ffa91e56a3a56f 100644

--- a/ash/wm/stacking_controller.cc

+++ b/ash/wm/stacking_controller.cc

@@ -9,7 +9,8 @@

#include "ash/shell.h"

#include "ash/shell_window_ids.h"

#include "ash/wm/always_on_top_controller.h"

-#include "ash/wm/coordinate_conversion.h"

+#include "ash/wm/aura/wm_window_aura.h"

+#include "ash/wm/common/root_window_finder.h"

#include "ash/wm/window_state.h"

#include "ash/wm/window_state_aura.h"

#include "ui/aura/client/aura_constants.h"

@@ -28,7 +29,7 @@ namespace {

aura::Window* FindContainerRoot(const gfx::Rect& bounds) {

if (bounds.x() == 0 && bounds.y() == 0 && bounds.IsEmpty())

return Shell::GetTargetRootWindow();

- return wm::GetRootWindowMatching(bounds);

+ return wm::WmWindowAura::GetAuraWindow(wm::GetRootWindowMatching(bounds));

}

aura::Window* GetContainerById(aura::Window* root, int id) {

« no previous file with comments | « ash/wm/panels/panel_window_resizer.cc ('k') | ash/wm/toplevel_window_event_handler.cc » ('j') | no next file with comments »