| Index: content/common/cursors/webcursor_aurax11.cc
|
| diff --git a/webkit/common/cursors/webcursor_aurax11.cc b/content/common/cursors/webcursor_aurax11.cc
|
| similarity index 96%
|
| rename from webkit/common/cursors/webcursor_aurax11.cc
|
| rename to content/common/cursors/webcursor_aurax11.cc
|
| index 0389f064069b37a35c673f2b994d1af24b6a4623..81184e4a76b8f5e9cc4b41646b2180eac71abebd 100644
|
| --- a/webkit/common/cursors/webcursor_aurax11.cc
|
| +++ b/content/common/cursors/webcursor_aurax11.cc
|
| @@ -2,11 +2,11 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "webkit/common/cursors/webcursor.h"
|
| +#include "content/common/cursors/webcursor.h"
|
|
|
| +#include <X11/cursorfont.h>
|
| #include <X11/Xcursor/Xcursor.h>
|
| #include <X11/Xlib.h>
|
| -#include <X11/cursorfont.h>
|
|
|
| #include "base/logging.h"
|
| #include "third_party/WebKit/public/platform/WebCursorInfo.h"
|
| @@ -14,6 +14,8 @@
|
| #include "ui/base/cursor/cursor_loader_x11.h"
|
| #include "ui/base/x/x11_util.h"
|
|
|
| +namespace content {
|
| +
|
| const ui::PlatformCursor WebCursor::GetPlatformCursor() {
|
| if (platform_cursor_)
|
| return platform_cursor_;
|
| @@ -83,3 +85,5 @@ void WebCursor::CopyPlatformData(const WebCursor& other) {
|
|
|
| device_scale_factor_ = other.device_scale_factor_;
|
| }
|
| +
|
| +} // namespace content
|
|
|