aura-x11: Add custom web cursor support.

content/browser/renderer_host/render_widget_host_view_aura.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
 #include "content/browser/renderer_host/backing_store_skia.h"
@@ skipping 903 matching lines @@
     } else {
       NativeWebKeyboardEvent webkit_event(event);
       host_->ForwardKeyboardEvent(webkit_event);
     }
   }
   return true;
 }
 
 gfx::NativeCursor RenderWidgetHostViewAura::GetCursor(const gfx::Point& point) {
   if (mouse_locked_)
-    return aura::kCursorNone;
+    return ui::kCursorNone;
   return current_cursor_.GetNativeCursor();
 }
 
 int RenderWidgetHostViewAura::GetNonClientComponent(
     const gfx::Point& point) const {
   return HTCLIENT;
 }
 
 bool RenderWidgetHostViewAura::OnMouseEvent(aura::MouseEvent* event) {
   if (mouse_locked_) {
@@ skipping 188 matching lines @@
 void RenderWidgetHostViewAura::UpdateCursorIfOverSelf() {
   const gfx::Point screen_point = gfx::Screen::GetCursorScreenPoint();
   aura::RootWindow* root_window = window_->GetRootWindow();
   if (!root_window)
     return;
 
   if (root_window->GetEventHandlerForPoint(screen_point) != window_)
     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);
 }
 
 ui::InputMethod* RenderWidgetHostViewAura::GetInputMethod() const {
   aura::RootWindow* root_window = window_->GetRootWindow();
   return root_window->GetProperty(aura::client::kRootWindowInputMethodKey);
 }
 
 bool RenderWidgetHostViewAura::NeedsInputGrab() {
@@ skipping 107 matching lines @@
     WebKit::WebScreenInfo* results) {
   const gfx::Size size = gfx::Screen::GetPrimaryMonitorSize();
   results->rect = WebKit::WebRect(0, 0, size.width(), size.height());
   results->availableRect = results->rect;
   // TODO(derat): Don't hardcode this?
   results->depth = 24;
   results->depthPerComponent = 8;
   results->verticalDPI = 96;
   results->horizontalDPI = 96;
 }