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/glue/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/memory/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/Source/Platform/chromium/public/WebImage.h" | |
16 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" | 15 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" |
17 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" | 16 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" |
18 #include "ui/base/resource/resource_bundle.h" | 17 #include "ui/base/resource/resource_bundle.h" |
19 #include "ui/gfx/point_conversions.h" | 18 #include "ui/gfx/point_conversions.h" |
20 #include "ui/gfx/size_conversions.h" | 19 #include "ui/gfx/size_conversions.h" |
21 | 20 |
22 | 21 |
23 using WebKit::WebCursorInfo; | 22 using WebKit::WebCursorInfo; |
24 using WebKit::WebImage; | |
25 using WebKit::WebSize; | 23 using WebKit::WebSize; |
26 | 24 |
27 // Declare symbols that are part of the 10.7 SDK. | 25 // Declare symbols that are part of the 10.7 SDK. |
28 #if !defined(MAC_OS_X_VERSION_10_7) || \ | 26 #if !defined(MAC_OS_X_VERSION_10_7) || \ |
29 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7 | 27 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7 |
30 | 28 |
31 @interface NSCursor (LionSDKDeclarations) | 29 @interface NSCursor (LionSDKDeclarations) |
32 + (NSCursor*)IBeamCursorForVerticalLayout; | 30 + (NSCursor*)IBeamCursorForVerticalLayout; |
33 @end | 31 @end |
34 | 32 |
(...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
419 return true; | 417 return true; |
420 } | 418 } |
421 | 419 |
422 void WebCursor::CleanupPlatformData() { | 420 void WebCursor::CleanupPlatformData() { |
423 return; | 421 return; |
424 } | 422 } |
425 | 423 |
426 void WebCursor::CopyPlatformData(const WebCursor& other) { | 424 void WebCursor::CopyPlatformData(const WebCursor& other) { |
427 return; | 425 return; |
428 } | 426 } |
OLD | NEW |