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 "ppapi/proxy/interface_list.h" | 5 #include "ppapi/proxy/interface_list.h" |
6 | 6 |
7 #include "base/lazy_instance.h" | 7 #include "base/lazy_instance.h" |
8 #include "base/memory/singleton.h" | 8 #include "base/memory/singleton.h" |
9 #include "ppapi/c/dev/ppb_alarms_dev.h" | 9 #include "ppapi/c/dev/ppb_alarms_dev.h" |
10 #include "ppapi/c/dev/ppb_audio_input_dev.h" | 10 #include "ppapi/c/dev/ppb_audio_input_dev.h" |
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
185 Permission current_required_permission = PERMISSION_PRIVATE; | 185 Permission current_required_permission = PERMISSION_PRIVATE; |
186 #include "ppapi/thunk/interfaces_ppb_private.h" | 186 #include "ppapi/thunk/interfaces_ppb_private.h" |
187 } | 187 } |
188 { | 188 { |
189 #if !defined(OS_NACL) | 189 #if !defined(OS_NACL) |
190 Permission current_required_permission = PERMISSION_FLASH; | 190 Permission current_required_permission = PERMISSION_FLASH; |
191 #include "ppapi/thunk/interfaces_ppb_private_flash.h" | 191 #include "ppapi/thunk/interfaces_ppb_private_flash.h" |
192 #endif // !defined(OS_NACL) | 192 #endif // !defined(OS_NACL) |
193 } | 193 } |
194 { | 194 { |
195 // TODO(teravest): These lines should be uncommented when a dev channel | 195 Permission current_required_permission = PERMISSION_DEV_CHANNEL; |
196 // interface is added. They're commented right now because they cause an | 196 #include "ppapi/thunk/interfaces_ppb_public_dev_channel.h" |
197 // unused variable warning. | |
198 // | |
199 // Permission current_required_permission = PERMISSION_DEV_CHANNEL; | |
200 // #include "ppapi/thunk/interfaces_ppb_public_dev_channel.h" | |
201 } | 197 } |
202 | 198 |
203 #undef PROXIED_API | 199 #undef PROXIED_API |
204 #undef PROXIED_IFACE | 200 #undef PROXIED_IFACE |
205 | 201 |
206 // Manually add some special proxies. Some of these don't have interfaces | 202 // Manually add some special proxies. Some of these don't have interfaces |
207 // that they support, so aren't covered by the macros above, but have proxies | 203 // that they support, so aren't covered by the macros above, but have proxies |
208 // for message routing. Others have different implementations between the | 204 // for message routing. Others have different implementations between the |
209 // proxy and the impl and there's no obvious message routing. | 205 // proxy and the impl and there's no obvious message routing. |
210 AddProxy(API_ID_RESOURCE_CREATION, &ResourceCreationProxy::Create); | 206 AddProxy(API_ID_RESOURCE_CREATION, &ResourceCreationProxy::Create); |
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
358 } | 354 } |
359 | 355 |
360 void InterfaceList::AddPPP(const char* name, | 356 void InterfaceList::AddPPP(const char* name, |
361 const void* iface) { | 357 const void* iface) { |
362 DCHECK(name_to_plugin_info_.find(name) == name_to_plugin_info_.end()); | 358 DCHECK(name_to_plugin_info_.find(name) == name_to_plugin_info_.end()); |
363 name_to_plugin_info_[name] = InterfaceInfo(iface, PERMISSION_NONE); | 359 name_to_plugin_info_[name] = InterfaceInfo(iface, PERMISSION_NONE); |
364 } | 360 } |
365 | 361 |
366 } // namespace proxy | 362 } // namespace proxy |
367 } // namespace ppapi | 363 } // namespace ppapi |
OLD | NEW |