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

Unified Diff: webkit/glue/chromium_bridge_impl.cc

Issue 155172: Start using WebCursorInfo from the WebKit API. WebCursorInfo is a... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 5 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 | « webkit/glue/chrome_client_impl.cc ('k') | webkit/glue/glue_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/chromium_bridge_impl.cc
===================================================================
--- webkit/glue/chromium_bridge_impl.cc (revision 20148)
+++ webkit/glue/chromium_bridge_impl.cc (working copy)
@@ -31,11 +31,11 @@
#include "build/build_config.h"
#include "googleurl/src/url_util.h"
#include "skia/ext/skia_utils_win.h"
+#include "webkit/api/public/WebCursorInfo.h"
#include "webkit/api/public/WebScreenInfo.h"
#include "webkit/glue/chrome_client_impl.h"
#include "webkit/glue/glue_util.h"
#include "webkit/glue/plugins/plugin_instance.h"
-#include "webkit/glue/webcursor.h"
#include "webkit/glue/webkit_glue.h"
#include "webkit/glue/webplugin_impl.h"
#include "webkit/glue/webview_impl.h"
@@ -43,10 +43,11 @@
#if defined(OS_WIN)
#include <windows.h>
#include <vssym32.h>
-
#include "base/gfx/native_theme.h"
#endif
+using WebKit::WebCursorInfo;
+
namespace {
gfx::NativeViewId ToNativeId(WebCore::Widget* widget) {
@@ -176,7 +177,7 @@
void ChromiumBridge::widgetSetCursor(Widget* widget, const Cursor& cursor) {
ChromeClientImpl* chrome_client = ToChromeClient(widget);
if (chrome_client)
- chrome_client->SetCursor(WebCursor(cursor.impl()));
+ chrome_client->SetCursor(webkit_glue::CursorToWebCursorInfo(cursor));
}
void ChromiumBridge::widgetSetFocus(Widget* widget) {
« no previous file with comments | « webkit/glue/chrome_client_impl.cc ('k') | webkit/glue/glue_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698