ui/views/widget/desktop_aura/desktop_root_window_host_linux.h - Issue 12263050: Rework ash::CursorManager into a corewm object, to share code with desktop.

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/views/widget/desktop_aura/desktop_root_window_host_linux.h

Issue 12263050: Rework ash::CursorManager into a corewm object, to share code with desktop. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase to ToT Created 7 years, 10 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

« no previous file with comments | « ui/views/widget/desktop_aura/desktop_native_cursor_manager.cc ('k') | ui/views/widget/desktop_aura/desktop_root_window_host_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/views/widget/desktop_aura/desktop_root_window_host_linux.h

diff --git a/ui/views/widget/desktop_aura/desktop_root_window_host_linux.h b/ui/views/widget/desktop_aura/desktop_root_window_host_linux.h

index 7e1f0895322d0c3e9d29ccc760da76a54b9f44d9..be31a5a574d58da264d805f355272579de273da4 100644

--- a/ui/views/widget/desktop_aura/desktop_root_window_host_linux.h

+++ b/ui/views/widget/desktop_aura/desktop_root_window_host_linux.h

@@ -30,11 +30,14 @@ class ScreenPositionClient;

namespace views {

class DesktopActivationClient;

-class DesktopCursorClient;

class DesktopDispatcherClient;

class X11DesktopWindowMoveClient;

class X11WindowEventFilter;

+namespace corewm {

+class CursorManager;

class VIEWS_EXPORT DesktopRootWindowHostLinux

: public DesktopRootWindowHost,

public aura::RootWindowHost,

@@ -202,7 +205,7 @@ class VIEWS_EXPORT DesktopRootWindowHostLinux

scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;

scoped_ptr<aura::client::FocusClient> focus_client_;

scoped_ptr<DesktopActivationClient> activation_client_;

- scoped_ptr<DesktopCursorClient> cursor_client_;

+ scoped_ptr<views::corewm::CursorManager> cursor_client_;

scoped_ptr<DesktopDispatcherClient> dispatcher_client_;

scoped_ptr<aura::client::ScreenPositionClient> position_client_;