ash/wm/partial_screenshot_view.cc - Issue 9463003: aura-x11: Add custom web cursor support.

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/wm/partial_screenshot_view.cc

Issue 9463003: aura-x11: Add custom web cursor support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

Index: ash/wm/partial_screenshot_view.cc

diff --git a/ash/wm/partial_screenshot_view.cc b/ash/wm/partial_screenshot_view.cc

index 9cb29dffa13137865c7346ab9b40cc332c7dfba0..42ae2503bf7c9f93c744a7870f71abebdb0d7441 100644

--- a/ash/wm/partial_screenshot_view.cc

+++ b/ash/wm/partial_screenshot_view.cc

@@ -8,9 +8,9 @@

#include "ash/shell.h"

#include "ash/shell_window_ids.h"

#include "ash/wm/partial_screenshot_event_filter.h"

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

#include "ui/aura/root_window.h"

#include "ui/aura/window.h"

+#include "ui/base/cursor/cursor.h"

#include "ui/gfx/canvas.h"

#include "ui/gfx/rect.h"

#include "ui/views/view.h"

@@ -71,7 +71,7 @@ void PartialScreenshotView::Cancel() {

gfx::NativeCursor PartialScreenshotView::GetCursor(

const views::MouseEvent& event) {

// Always use "crosshair" cursor.

- return aura::kCursorCross;

+ return ui::kCursorCross;

}

void PartialScreenshotView::OnPaint(gfx::Canvas* canvas) {

« no previous file with comments | « ash/wm/panel_window_event_filter.cc ('k') | ash/wm/root_window_event_filter.cc » ('j') | no next file with comments »