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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: third_party/npapi/bindings/npapi.h

Issue 4096004: PyAuto hooks for Sync in TestingAutomationProvider (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase; Addressing final review comment. Created 10 years, 1 month 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 | « chrome/test/testing_profile.h ('k') | 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 /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ 1 /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
2 /* ***** BEGIN LICENSE BLOCK ***** 2 /* ***** BEGIN LICENSE BLOCK *****
3 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 3 * Version: MPL 1.1/GPL 2.0/LGPL 2.1
4 * 4 *
5 * The contents of this file are subject to the Mozilla Public License Version 5 * The contents of this file are subject to the Mozilla Public License Version
6 * 1.1 (the "License"); you may not use this file except in compliance with 6 * 1.1 (the "License"); you may not use this file except in compliance with
7 * the License. You may obtain a copy of the License at 7 * the License. You may obtain a copy of the License at
8 * http://www.mozilla.org/MPL/ 8 * http://www.mozilla.org/MPL/
9 * 9 *
10 * Software distributed under the License is distributed on an "AS IS" basis, 10 * Software distributed under the License is distributed on an "AS IS" basis,
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 #if defined(_WIN32) && !defined(__SYMBIAN32__) 66 #if defined(_WIN32) && !defined(__SYMBIAN32__)
67 #include <windows.h> 67 #include <windows.h>
68 #ifndef XP_WIN 68 #ifndef XP_WIN
69 #define XP_WIN 1 69 #define XP_WIN 1
70 #endif 70 #endif
71 #endif 71 #endif
72 72
73 /* BEGIN GOOGLE MODIFICATIONS */ 73 /* BEGIN GOOGLE MODIFICATIONS */
74 /* On Linux and Mac, be sure to set Mozilla-specific macros. */ 74 /* On Linux and Mac, be sure to set Mozilla-specific macros. */
75 #if defined(USE_X11) 75 #if defined(USE_X11)
76 #if !defined(XP_UNIX)
76 #define XP_UNIX 1 77 #define XP_UNIX 1
78 #endif
79 #if !defined(MOZ_X11)
77 #define MOZ_X11 1 80 #define MOZ_X11 1
78 #endif 81 #endif
82 #endif
79 /* END GOOGLE MODIFICATIONS */ 83 /* END GOOGLE MODIFICATIONS */
80 84
81 #if defined(__SYMBIAN32__) 85 #if defined(__SYMBIAN32__)
82 #ifndef XP_SYMBIAN 86 #ifndef XP_SYMBIAN
83 #define XP_SYMBIAN 1 87 #define XP_SYMBIAN 1
84 #undef XP_WIN 88 #undef XP_WIN
85 #endif 89 #endif
86 #endif 90 #endif
87 91
88 #if defined(__APPLE_CC__) && !defined(XP_UNIX) 92 #if defined(__APPLE_CC__) && !defined(XP_UNIX)
(...skipping 787 matching lines...) Expand 10 before | Expand all | Expand 10 after
876 #ifdef __cplusplus 880 #ifdef __cplusplus
877 } /* end extern "C" */ 881 } /* end extern "C" */
878 #endif 882 #endif
879 883
880 #endif /* RC_INVOKED */ 884 #endif /* RC_INVOKED */
881 #if defined(__OS2__) 885 #if defined(__OS2__)
882 #pragma pack() 886 #pragma pack()
883 #endif 887 #endif
884 888
885 #endif /* npapi_h_ */ 889 #endif /* npapi_h_ */
OLDNEW
« no previous file with comments | « chrome/test/testing_profile.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698