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

Unified Diff: content/common/cursors/webcursor_aurax11.cc

Issue 201473002: Move webcursors code from webkit/ to content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: gfx image include Created 6 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 | « content/common/cursors/webcursor_aurawin.cc ('k') | content/common/cursors/webcursor_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « content/common/cursors/webcursor_aurawin.cc ('k') | content/common/cursors/webcursor_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698