Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(130)

Issues Search
    My Issues | Starred     Open | Closed | All

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: sort headers. 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/panel_window_event_filter.cc ('k') | ash/wm/root_window_event_filter.cc » ('j') | ui/base/cursor/cursor.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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') | ui/base/cursor/cursor.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698