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

Side by Side Diff: ppapi/proxy/interface_list.h

Issue 10116003: Add #ifdefs to separate NaCl and non-NaCl PPAPI Proxy code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 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 | « ppapi/ppapi_proxy_untrusted.gyp ('k') | ppapi/proxy/interface_list.cc » ('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) 2011 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 #ifndef PPAPI_PROXY_INTERFACE_LIST_H_ 5 #ifndef PPAPI_PROXY_INTERFACE_LIST_H_
6 #define PPAPI_PROXY_INTERFACE_LIST_H_ 6 #define PPAPI_PROXY_INTERFACE_LIST_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 : id(in_id), 45 : id(in_id),
46 iface(in_interface) { 46 iface(in_interface) {
47 } 47 }
48 48
49 ApiID id; 49 ApiID id;
50 const void* iface; 50 const void* iface;
51 }; 51 };
52 52
53 typedef std::map<std::string, InterfaceInfo> NameToInterfaceInfoMap; 53 typedef std::map<std::string, InterfaceInfo> NameToInterfaceInfoMap;
54 54
55 #if !defined(OS_NACL)
55 // Registers the Flash-specific interfaces. 56 // Registers the Flash-specific interfaces.
56 // 57 //
57 // TODO(brettw) these should be moved somewhere separately so we can compile 58 // TODO(brettw) these should be moved somewhere separately so we can compile
58 // the proxy for NaCl without Flash interface support. 59 // the proxy for NaCl without Flash interface support.
59 void AddFlashInterfaces(); 60 void AddFlashInterfaces();
61 #endif // !defined(OS_NACL)
60 62
61 void AddProxy(ApiID id, InterfaceProxy::Factory factory); 63 void AddProxy(ApiID id, InterfaceProxy::Factory factory);
62 64
63 void AddPPB(const char* name, ApiID id, const void* iface); 65 void AddPPB(const char* name, ApiID id, const void* iface);
64 void AddPPP(const char* name, ApiID id, const void* iface); 66 void AddPPP(const char* name, ApiID id, const void* iface);
65 67
66 // Old-style add functions. These should be removed when the rest of the 68 // Old-style add functions. These should be removed when the rest of the
67 // proxies are converted over to using the new system. 69 // proxies are converted over to using the new system.
68 void AddPPB(const InterfaceProxy::Info* info); 70 void AddPPB(const InterfaceProxy::Info* info);
69 void AddPPP(const InterfaceProxy::Info* info); 71 void AddPPP(const InterfaceProxy::Info* info);
70 72
71 NameToInterfaceInfoMap name_to_browser_info_; 73 NameToInterfaceInfoMap name_to_browser_info_;
72 NameToInterfaceInfoMap name_to_plugin_info_; 74 NameToInterfaceInfoMap name_to_plugin_info_;
73 75
74 InterfaceProxy::Factory id_to_factory_[API_ID_COUNT]; 76 InterfaceProxy::Factory id_to_factory_[API_ID_COUNT];
75 77
76 DISALLOW_COPY_AND_ASSIGN(InterfaceList); 78 DISALLOW_COPY_AND_ASSIGN(InterfaceList);
77 }; 79 };
78 80
79 } // namespace proxy 81 } // namespace proxy
80 } // namespace ppapi 82 } // namespace ppapi
81 83
82 #endif // PPAPI_PROXY_INTERFACE_LIST_H_ 84 #endif // PPAPI_PROXY_INTERFACE_LIST_H_
83 85
OLDNEW
« no previous file with comments | « ppapi/ppapi_proxy_untrusted.gyp ('k') | ppapi/proxy/interface_list.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698