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 "base/memory/scoped_nsobject.h" | 12 #include "base/mac/scoped_nsobject.h" |
13 #include "grit/webkit_chromium_resources.h" | 13 #include "grit/webkit_chromium_resources.h" |
14 #include "skia/ext/skia_utils_mac.h" | 14 #include "skia/ext/skia_utils_mac.h" |
| 15 #include "third_party/WebKit/public/platform/WebSize.h" |
15 #include "third_party/WebKit/public/web/WebCursorInfo.h" | 16 #include "third_party/WebKit/public/web/WebCursorInfo.h" |
16 #include "third_party/WebKit/public/platform/WebSize.h" | |
17 #include "ui/base/resource/resource_bundle.h" | 17 #include "ui/base/resource/resource_bundle.h" |
18 #include "ui/gfx/point_conversions.h" | 18 #include "ui/gfx/point_conversions.h" |
19 #include "ui/gfx/size_conversions.h" | 19 #include "ui/gfx/size_conversions.h" |
20 | 20 |
21 | 21 |
22 using WebKit::WebCursorInfo; | 22 using WebKit::WebCursorInfo; |
23 using WebKit::WebSize; | 23 using WebKit::WebSize; |
24 | 24 |
25 // Declare symbols that are part of the 10.7 SDK. | 25 // Declare symbols that are part of the 10.7 SDK. |
26 #if !defined(MAC_OS_X_VERSION_10_7) || \ | 26 #if !defined(MAC_OS_X_VERSION_10_7) || \ |
(...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
416 return true; | 416 return true; |
417 } | 417 } |
418 | 418 |
419 void WebCursor::CleanupPlatformData() { | 419 void WebCursor::CleanupPlatformData() { |
420 return; | 420 return; |
421 } | 421 } |
422 | 422 |
423 void WebCursor::CopyPlatformData(const WebCursor& other) { | 423 void WebCursor::CopyPlatformData(const WebCursor& other) { |
424 return; | 424 return; |
425 } | 425 } |
OLD | NEW |