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