ash/display/screen_ash.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/display/screen_ash.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/display/screen_ash.cc

diff --git a/ash/display/screen_ash.cc b/ash/display/screen_ash.cc

index d5c33a4e65b5f2c7e37828f13c25fb7be3cf048f..4b420ba6bec36c87b63e20824aba5ffa60d66c01 100644

--- a/ash/display/screen_ash.cc

+++ b/ash/display/screen_ash.cc

@@ -11,7 +11,8 @@

#include "ash/shelf/shelf_layout_manager.h"

#include "ash/shelf/shelf_widget.h"

#include "ash/shell.h"

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

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

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

#include "base/logging.h"

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

#include "ui/aura/env.h"

@@ -104,7 +105,8 @@ gfx::NativeWindow ScreenAsh::GetWindowUnderCursor() {

}

gfx::NativeWindow ScreenAsh::GetWindowAtScreenPoint(const gfx::Point& point) {

- aura::Window* root_window = wm::GetRootWindowAt(point);

+ aura::Window* root_window =

+ wm::WmWindowAura::GetAuraWindow(wm::GetRootWindowAt(point));

aura::client::ScreenPositionClient* position_client =

aura::client::GetScreenPositionClient(root_window);

« no previous file with comments | « ash/autoclick/autoclick_controller.cc ('k') | ash/display/screen_position_controller.cc » ('j') | no next file with comments »