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

Side by Side Diff: webkit/plugins/ppapi/plugin_module.cc

Issue 6871040: Rename Instance_Trusted to Instance_Private, wire it up in Chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix up based on review comments. Created 9 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/tests/all_cpp_includes.h ('k') | webkit/plugins/ppapi/ppapi_plugin_instance.h » ('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) 2011 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 "webkit/plugins/ppapi/plugin_module.h" 5 #include "webkit/plugins/ppapi/plugin_module.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 #include "ppapi/c/ppb_url_request_info.h" 48 #include "ppapi/c/ppb_url_request_info.h"
49 #include "ppapi/c/ppb_url_response_info.h" 49 #include "ppapi/c/ppb_url_response_info.h"
50 #include "ppapi/c/ppb_var.h" 50 #include "ppapi/c/ppb_var.h"
51 #include "ppapi/c/ppp.h" 51 #include "ppapi/c/ppp.h"
52 #include "ppapi/c/ppp_instance.h" 52 #include "ppapi/c/ppp_instance.h"
53 #include "ppapi/c/private/ppb_flash.h" 53 #include "ppapi/c/private/ppb_flash.h"
54 #include "ppapi/c/private/ppb_flash_clipboard.h" 54 #include "ppapi/c/private/ppb_flash_clipboard.h"
55 #include "ppapi/c/private/ppb_flash_file.h" 55 #include "ppapi/c/private/ppb_flash_file.h"
56 #include "ppapi/c/private/ppb_flash_menu.h" 56 #include "ppapi/c/private/ppb_flash_menu.h"
57 #include "ppapi/c/private/ppb_flash_net_connector.h" 57 #include "ppapi/c/private/ppb_flash_net_connector.h"
58 #include "ppapi/c/private/ppb_instance_private.h"
58 #include "ppapi/c/private/ppb_pdf.h" 59 #include "ppapi/c/private/ppb_pdf.h"
59 #include "ppapi/c/private/ppb_proxy_private.h" 60 #include "ppapi/c/private/ppb_proxy_private.h"
60 #include "ppapi/c/private/ppb_nacl_private.h" 61 #include "ppapi/c/private/ppb_nacl_private.h"
61 #include "ppapi/c/trusted/ppb_broker_trusted.h" 62 #include "ppapi/c/trusted/ppb_broker_trusted.h"
62 #include "ppapi/c/trusted/ppb_image_data_trusted.h" 63 #include "ppapi/c/trusted/ppb_image_data_trusted.h"
63 #include "ppapi/c/trusted/ppb_url_loader_trusted.h" 64 #include "ppapi/c/trusted/ppb_url_loader_trusted.h"
64 #include "webkit/plugins/ppapi/callbacks.h" 65 #include "webkit/plugins/ppapi/callbacks.h"
65 #include "webkit/plugins/ppapi/common.h" 66 #include "webkit/plugins/ppapi/common.h"
66 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h" 67 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
67 #include "webkit/plugins/ppapi/ppb_audio_impl.h" 68 #include "webkit/plugins/ppapi/ppb_audio_impl.h"
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 if (strcmp(name, PPB_FULLSCREEN_DEV_INTERFACE) == 0) 274 if (strcmp(name, PPB_FULLSCREEN_DEV_INTERFACE) == 0)
274 return PluginInstance::GetFullscreenInterface(); 275 return PluginInstance::GetFullscreenInterface();
275 if (strcmp(name, PPB_GRAPHICS_2D_INTERFACE) == 0) 276 if (strcmp(name, PPB_GRAPHICS_2D_INTERFACE) == 0)
276 return PPB_Graphics2D_Impl::GetInterface(); 277 return PPB_Graphics2D_Impl::GetInterface();
277 if (strcmp(name, PPB_IMAGEDATA_INTERFACE) == 0) 278 if (strcmp(name, PPB_IMAGEDATA_INTERFACE) == 0)
278 return PPB_ImageData_Impl::GetInterface(); 279 return PPB_ImageData_Impl::GetInterface();
279 if (strcmp(name, PPB_IMAGEDATA_TRUSTED_INTERFACE) == 0) 280 if (strcmp(name, PPB_IMAGEDATA_TRUSTED_INTERFACE) == 0)
280 return PPB_ImageData_Impl::GetTrustedInterface(); 281 return PPB_ImageData_Impl::GetTrustedInterface();
281 if (strcmp(name, PPB_INSTANCE_INTERFACE) == 0) 282 if (strcmp(name, PPB_INSTANCE_INTERFACE) == 0)
282 return PluginInstance::GetInterface(); 283 return PluginInstance::GetInterface();
284 if (strcmp(name, PPB_INSTANCE_PRIVATE_INTERFACE) == 0)
285 return PluginInstance::GetPrivateInterface();
283 if (strcmp(name, PPB_MESSAGING_INTERFACE) == 0) 286 if (strcmp(name, PPB_MESSAGING_INTERFACE) == 0)
284 return PluginInstance::GetMessagingInterface(); 287 return PluginInstance::GetMessagingInterface();
285 if (strcmp(name, PPB_PDF_INTERFACE) == 0) 288 if (strcmp(name, PPB_PDF_INTERFACE) == 0)
286 return PPB_PDF_Impl::GetInterface(); 289 return PPB_PDF_Impl::GetInterface();
287 if (strcmp(name, PPB_PROXY_PRIVATE_INTERFACE) == 0) 290 if (strcmp(name, PPB_PROXY_PRIVATE_INTERFACE) == 0)
288 return PPB_Proxy_Impl::GetInterface(); 291 return PPB_Proxy_Impl::GetInterface();
289 if (strcmp(name, PPB_SCROLLBAR_DEV_INTERFACE) == 0) 292 if (strcmp(name, PPB_SCROLLBAR_DEV_INTERFACE) == 0)
290 return PPB_Scrollbar_Impl::GetInterface(); 293 return PPB_Scrollbar_Impl::GetInterface();
291 if (strcmp(name, PPB_TRANSPORT_DEV_INTERFACE) == 0) 294 if (strcmp(name, PPB_TRANSPORT_DEV_INTERFACE) == 0)
292 return PPB_Transport_Impl::GetInterface(); 295 return PPB_Transport_Impl::GetInterface();
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
546 int retval = entry_points_.initialize_module(pp_module(), &GetInterface); 549 int retval = entry_points_.initialize_module(pp_module(), &GetInterface);
547 if (retval != 0) { 550 if (retval != 0) {
548 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval; 551 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval;
549 return false; 552 return false;
550 } 553 }
551 return true; 554 return true;
552 } 555 }
553 556
554 } // namespace ppapi 557 } // namespace ppapi
555 } // namespace webkit 558 } // namespace webkit
OLDNEW
« no previous file with comments | « ppapi/tests/all_cpp_includes.h ('k') | webkit/plugins/ppapi/ppapi_plugin_instance.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698