OLD | NEW |
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 "webkit/common/cursors/webcursor.h" | 5 #include "webkit/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 "grit/webkit_resources.h" | 12 #include "grit/webkit_resources.h" |
13 #include "skia/ext/skia_utils_mac.h" | 13 #include "skia/ext/skia_utils_mac.h" |
| 14 #include "third_party/WebKit/public/platform/WebCursorInfo.h" |
14 #include "third_party/WebKit/public/platform/WebSize.h" | 15 #include "third_party/WebKit/public/platform/WebSize.h" |
15 #include "third_party/WebKit/public/web/WebCursorInfo.h" | |
16 #include "ui/base/resource/resource_bundle.h" | 16 #include "ui/base/resource/resource_bundle.h" |
17 #include "ui/gfx/point_conversions.h" | 17 #include "ui/gfx/point_conversions.h" |
18 #include "ui/gfx/size_conversions.h" | 18 #include "ui/gfx/size_conversions.h" |
19 | 19 |
20 | 20 |
21 using blink::WebCursorInfo; | 21 using blink::WebCursorInfo; |
22 using blink::WebSize; | 22 using blink::WebSize; |
23 | 23 |
24 // Declare symbols that are part of the 10.7 SDK. | 24 // Declare symbols that are part of the 10.7 SDK. |
25 #if !defined(MAC_OS_X_VERSION_10_7) || \ | 25 #if !defined(MAC_OS_X_VERSION_10_7) || \ |
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
386 return true; | 386 return true; |
387 } | 387 } |
388 | 388 |
389 void WebCursor::CleanupPlatformData() { | 389 void WebCursor::CleanupPlatformData() { |
390 return; | 390 return; |
391 } | 391 } |
392 | 392 |
393 void WebCursor::CopyPlatformData(const WebCursor& other) { | 393 void WebCursor::CopyPlatformData(const WebCursor& other) { |
394 return; | 394 return; |
395 } | 395 } |
OLD | NEW |