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