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

diff --git a/ash/shell.cc b/ash/shell.cc

index d5592217879e23e75a957ad60ecd5d5aecedbf12..a24d502c0db8340311ae0b532fca1fc09cbc0b7c 100644

--- a/ash/shell.cc

+++ b/ash/shell.cc

@@ -60,7 +60,7 @@

#include "ash/wm/ash_focus_rules.h"

#include "ash/wm/ash_native_cursor_manager.h"

#include "ash/wm/aura/wm_globals_aura.h"

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

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

#include "ash/wm/event_client_impl.h"

#include "ash/wm/lock_state_controller.h"

#include "ash/wm/maximize_mode/maximize_mode_controller.h"

@@ -299,8 +299,8 @@ void Shell::ShowContextMenu(const gfx::Point& location_in_screen,

if (session_state_delegate_->IsScreenLocked())

return;

- aura::Window* root =

- wm::GetRootWindowMatching(gfx::Rect(location_in_screen, gfx::Size()));

+ aura::Window* root = wm::WmWindowAura::GetAuraWindow(

+ wm::GetRootWindowMatching(gfx::Rect(location_in_screen, gfx::Size())));

GetRootWindowController(root)

->ShowContextMenu(location_in_screen, source_type);

}

« no previous file with comments | « ash/shelf/shelf_view.cc ('k') | ash/test/ui_controls_factory_ash.cc » ('j') | no next file with comments »