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

Side by Side 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:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/common/cursors/webcursor.h" 5 #include "content/common/cursors/webcursor.h"
6 6
7 #import <AppKit/AppKit.h> 7 #import <AppKit/AppKit.h>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/mac/mac_util.h" 10 #include "base/mac/mac_util.h"
11 #include "base/mac/scoped_cftyperef.h" 11 #include "base/mac/scoped_cftyperef.h"
12 #include "base/mac/sdk_forward_declarations.h" 12 #include "base/mac/sdk_forward_declarations.h"
13 #include "content/app/resources/grit/content_resources.h"
13 #include "content/public/common/content_client.h" 14 #include "content/public/common/content_client.h"
14 #include "grit/webkit_resources.h"
15 #include "skia/ext/skia_utils_mac.h" 15 #include "skia/ext/skia_utils_mac.h"
16 #include "third_party/WebKit/public/platform/WebCursorInfo.h" 16 #include "third_party/WebKit/public/platform/WebCursorInfo.h"
17 #include "third_party/WebKit/public/platform/WebSize.h" 17 #include "third_party/WebKit/public/platform/WebSize.h"
18 #include "ui/gfx/image/image.h" 18 #include "ui/gfx/image/image.h"
19 #include "ui/gfx/point_conversions.h" 19 #include "ui/gfx/point_conversions.h"
20 #include "ui/gfx/size_conversions.h" 20 #include "ui/gfx/size_conversions.h"
21 21
22
23 using blink::WebCursorInfo; 22 using blink::WebCursorInfo;
24 using blink::WebSize; 23 using blink::WebSize;
25 24
26 // Private interface to CoreCursor, as of Mac OS X 10.7. This is essentially the 25 // Private interface to CoreCursor, as of Mac OS X 10.7. This is essentially the
27 // implementation of WKCursor in WebKitSystemInterface. 26 // implementation of WKCursor in WebKitSystemInterface.
28 27
29 enum { 28 enum {
30 kArrowCursor = 0, 29 kArrowCursor = 0,
31 kIBeamCursor = 1, 30 kIBeamCursor = 1,
32 kMakeAliasCursor = 2, 31 kMakeAliasCursor = 2,
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 379
381 void WebCursor::CleanupPlatformData() { 380 void WebCursor::CleanupPlatformData() {
382 return; 381 return;
383 } 382 }
384 383
385 void WebCursor::CopyPlatformData(const WebCursor& other) { 384 void WebCursor::CopyPlatformData(const WebCursor& other) {
386 return; 385 return;
387 } 386 }
388 387
389 } // namespace content 388 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698