ash/display/mouse_cursor_event_filter.cc - Issue 10692170: Aura desktop: Show resize cursors again.

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

Issue 10692170: Aura desktop: Show resize cursors again. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

Index: ash/display/mouse_cursor_event_filter.cc

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

index 781742adb41ccdcce9288c4231869e4f552b0db2..9b6d2973cde40375253e5cd909298ce5305d84bc 100644

--- a/ash/display/mouse_cursor_event_filter.cc

+++ b/ash/display/mouse_cursor_event_filter.cc

@@ -5,7 +5,8 @@

#include "ash/display/mouse_cursor_event_filter.h"

#include "ash/display/display_controller.h"

-#include "ui/aura/cursor_manager.h"

+#include "ash/shell.h"

+#include "ash/wm/cursor_manager.h"

#include "ui/aura/env.h"

#include "ui/aura/event.h"

#include "ui/aura/root_window.h"

@@ -31,7 +32,7 @@ bool MouseCursorEventFilter::PreHandleKeyEvent(aura::Window* target,

bool MouseCursorEventFilter::PreHandleMouseEvent(aura::Window* target,

aura::MouseEvent* event) {

if (event->type() != ui::ET_MOUSE_MOVED ||

- aura::Env::GetInstance()->cursor_manager()->is_cursor_locked())

+ ash::Shell::GetInstance()->cursor_manager()->is_cursor_locked())

return false;

aura::RootWindow* current_root = target->GetRootWindow();

gfx::Point location_in_root(event->location());

« no previous file with comments | « ash/ash.gyp ('k') | ash/drag_drop/drag_drop_controller.cc » ('j') | no next file with comments »