content/common/cursors/webcursor_mac.mm - Issue 486573002: Move webkit resources over to content.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/common/cursors/webcursor_mac.mm

Issue 486573002: Move webkit resources over to content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rm the build files from webkit/glue/resources Created 6 years, 4 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:

Index: content/common/cursors/webcursor_mac.mm

diff --git a/content/common/cursors/webcursor_mac.mm b/content/common/cursors/webcursor_mac.mm

index 7ba1b29f965b9153027be7aaa40200a32048cd07..c0a7885c6ef30e4199695a4edf97653060b3898f 100644

--- a/content/common/cursors/webcursor_mac.mm

+++ b/content/common/cursors/webcursor_mac.mm

@@ -10,8 +10,8 @@

#include "base/mac/mac_util.h"

#include "base/mac/scoped_cftyperef.h"

#include "base/mac/sdk_forward_declarations.h"

+#include "content/app/resources/grit/content_resources.h"

#include "content/public/common/content_client.h"

-#include "grit/webkit_resources.h"

#include "skia/ext/skia_utils_mac.h"

#include "third_party/WebKit/public/platform/WebCursorInfo.h"

#include "third_party/WebKit/public/platform/WebSize.h"

@@ -19,7 +19,6 @@

#include "ui/gfx/point_conversions.h"

#include "ui/gfx/size_conversions.h"

using blink::WebCursorInfo;

using blink::WebSize;