ui/wm/core/compound_event_filter.cc - Issue 211733003: Move GetCursor() method from WindowDelegate to its own delegate interface CursorDelegate.

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: ui/wm/core/compound_event_filter.cc

Issue 211733003: Move GetCursor() method from WindowDelegate to its own delegate interface CursorDelegate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 6 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:

View side-by-side diff with in-line comments

Download patch

Index: ui/wm/core/compound_event_filter.cc

diff --git a/ui/wm/core/compound_event_filter.cc b/ui/wm/core/compound_event_filter.cc

index 711d7e43c40be82b9efa097e57a73948045e7d46..f50805d4e36a0541274e59dcb17e3360b20129e1 100644

--- a/ui/wm/core/compound_event_filter.cc

+++ b/ui/wm/core/compound_event_filter.cc

@@ -15,6 +15,7 @@

#include "ui/base/hit_test.h"

#include "ui/events/event.h"

#include "ui/wm/public/activation_client.h"

+#include "ui/wm/public/cursor_delegate.h"

#include "ui/wm/public/drag_drop_client.h"

#if defined(OS_CHROMEOS) && defined(USE_X11)

@@ -158,7 +159,9 @@ void CompoundEventFilter::UpdateCursor(aura::Window* target,

aura::client::CursorClient* cursor_client =

aura::client::GetCursorClient(root_window);

if (cursor_client) {

- gfx::NativeCursor cursor = target->GetCursor(event->location());

+ CursorDelegate* delegate = GetCursorDelegate(target);

+ gfx::NativeCursor cursor = delegate ?

+ delegate->GetCursorForPoint(event->location()) : gfx::kNullCursor;

if ((event->flags() & ui::EF_IS_NON_CLIENT)) {

if (target->delegate()) {

int window_component =

« no previous file with comments | « ui/views/widget/native_widget_aura.cc ('k') | ui/wm/public/cursor_delegate.h » ('j') | no next file with comments »