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

Side by Side Diff: third_party/apple_webkit/WebKitSystemInterface.h

Issue 9351008: Merge remote-tracking branch 'refs/remotes/origin/master' after r120680. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 10 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 | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 WebKitSystemInterface.h 2 WebKitSystemInterface.h
3 Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 3 Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
4 4
5 Public header file. 5 Public header file.
6
7 Redistribution and use in source and binary forms, with or without
8 modification, are permitted provided that the following conditions
9 are met:
10 1. Redistributions of source code must retain the above copyright
11 notice, this list of conditions and the following disclaimer.
12 2. Redistributions in binary form must reproduce the above copyright
13 notice, this list of conditions and the following disclaimer in the
14 documentation and/or other materials provided with the distribution.
15
16 THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
17 EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
20 DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
23 ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
6 */ 26 */
7 27
8 #import <Cocoa/Cocoa.h> 28 #import <Cocoa/Cocoa.h>
9 #import <Carbon/Carbon.h> 29 #import <Carbon/Carbon.h>
10 30
11 @class AVAsset; 31 @class AVAsset;
12 @class QTMovie; 32 @class QTMovie;
13 @class QTMovieView; 33 @class QTMovieView;
14 34
15 #ifdef __cplusplus 35 #ifdef __cplusplus
(...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after
457 #endif 477 #endif
458 478
459 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1080 479 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
460 NSString *WKGetMacOSXVersionString(void); 480 NSString *WKGetMacOSXVersionString(void);
461 bool WKExecutableWasLinkedOnOrBeforeLion(void); 481 bool WKExecutableWasLinkedOnOrBeforeLion(void);
462 #endif 482 #endif
463 483
464 #ifdef __cplusplus 484 #ifdef __cplusplus
465 } 485 }
466 #endif 486 #endif
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698