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

Unified Diff: content/browser/renderer_host/render_widget_host_view_aura.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/content_setting_bubble_contents.cc ('k') | ui/aura/aura.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_widget_host_view_aura.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index d851114e35387c474bcb1d78be82a4e67f83b716..8962d028c19ee843196fa847eb9509fff9fa2914 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -921,7 +921,7 @@ bool RenderWidgetHostViewAura::OnKeyEvent(aura::KeyEvent* event) {
gfx::NativeCursor RenderWidgetHostViewAura::GetCursor(const gfx::Point& point) {
if (mouse_locked_)
- return aura::kCursorNone;
+ return ui::kCursorNone;
return current_cursor_.GetNativeCursor();
}
@@ -1130,8 +1130,8 @@ void RenderWidgetHostViewAura::UpdateCursorIfOverSelf() {
return;
gfx::NativeCursor cursor = current_cursor_.GetNativeCursor();
- if (is_loading_ && cursor == aura::kCursorPointer)
- cursor = aura::kCursorProgress;
+ if (is_loading_ && cursor == ui::kCursorPointer)
+ cursor = ui::kCursorProgress;
root_window->SetCursor(cursor);
}
« no previous file with comments | « chrome/browser/ui/views/content_setting_bubble_contents.cc ('k') | ui/aura/aura.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698