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

Side by Side Diff: content/common/cursors/webcursor_mac.mm

Issue 322623002: Consolidate SDK forwards in sdk_forward_declarations.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nit Created 6 years, 6 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
« no previous file with comments | « content/browser/theme_helper_mac.mm ('k') | content/shell/browser/shell_mac.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "content/public/common/content_client.h" 13 #include "content/public/common/content_client.h"
13 #include "grit/webkit_resources.h" 14 #include "grit/webkit_resources.h"
14 #include "skia/ext/skia_utils_mac.h" 15 #include "skia/ext/skia_utils_mac.h"
15 #include "third_party/WebKit/public/platform/WebCursorInfo.h" 16 #include "third_party/WebKit/public/platform/WebCursorInfo.h"
16 #include "third_party/WebKit/public/platform/WebSize.h" 17 #include "third_party/WebKit/public/platform/WebSize.h"
17 #include "ui/gfx/image/image.h" 18 #include "ui/gfx/image/image.h"
18 #include "ui/gfx/point_conversions.h" 19 #include "ui/gfx/point_conversions.h"
19 #include "ui/gfx/size_conversions.h" 20 #include "ui/gfx/size_conversions.h"
20 21
21 22
22 using blink::WebCursorInfo; 23 using blink::WebCursorInfo;
23 using blink::WebSize; 24 using blink::WebSize;
24 25
25 // Declare symbols that are part of the 10.7 SDK.
26 #if !defined(MAC_OS_X_VERSION_10_7) || \
27 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
28
29 @interface NSCursor (LionSDKDeclarations)
30 + (NSCursor*)IBeamCursorForVerticalLayout;
31 @end
32
33 #endif // MAC_OS_X_VERSION_10_7
34
35 // Private interface to CoreCursor, as of Mac OS X 10.7. This is essentially the 26 // Private interface to CoreCursor, as of Mac OS X 10.7. This is essentially the
36 // implementation of WKCursor in WebKitSystemInterface. 27 // implementation of WKCursor in WebKitSystemInterface.
37 28
38 enum { 29 enum {
39 kArrowCursor = 0, 30 kArrowCursor = 0,
40 kIBeamCursor = 1, 31 kIBeamCursor = 1,
41 kMakeAliasCursor = 2, 32 kMakeAliasCursor = 2,
42 kOperationNotAllowedCursor = 3, 33 kOperationNotAllowedCursor = 3,
43 kBusyButClickableCursor = 4, 34 kBusyButClickableCursor = 4,
44 kCopyCursor = 5, 35 kCopyCursor = 5,
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 382
392 void WebCursor::CleanupPlatformData() { 383 void WebCursor::CleanupPlatformData() {
393 return; 384 return;
394 } 385 }
395 386
396 void WebCursor::CopyPlatformData(const WebCursor& other) { 387 void WebCursor::CopyPlatformData(const WebCursor& other) {
397 return; 388 return;
398 } 389 }
399 390
400 } // namespace content 391 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/theme_helper_mac.mm ('k') | content/shell/browser/shell_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698