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

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

Issue 11316316: Implement an IsAllowed function in the pepper PPB_Broker_Trusted API (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years 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 | « webkit/plugins/ppapi/plugin_module.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) 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 "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/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 515 matching lines...) Expand 10 before | Expand all | Expand 10 after
526 // static 526 // static
527 PluginModule::GetInterfaceFunc PluginModule::GetLocalGetInterfaceFunc() { 527 PluginModule::GetInterfaceFunc PluginModule::GetLocalGetInterfaceFunc() {
528 return &GetInterface; 528 return &GetInterface;
529 } 529 }
530 530
531 // static 531 // static
532 bool PluginModule::SupportsInterface(const char* name) { 532 bool PluginModule::SupportsInterface(const char* name) {
533 return !!InternalGetInterface(name); 533 return !!InternalGetInterface(name);
534 } 534 }
535 535
536 PluginInstance* PluginModule::CreateInstance(PluginDelegate* delegate) { 536 PluginInstance* PluginModule::CreateInstance(
537 PluginInstance* instance = PluginInstance::Create(delegate, this); 537 PluginDelegate* delegate,
538 WebKit::WebPluginContainer* container,
539 const GURL& plugin_url) {
540 PluginInstance* instance = PluginInstance::Create(delegate, this, container,
541 plugin_url);
538 if (!instance) { 542 if (!instance) {
539 LOG(WARNING) << "Plugin doesn't support instance interface, failing."; 543 LOG(WARNING) << "Plugin doesn't support instance interface, failing.";
540 return NULL; 544 return NULL;
541 } 545 }
542 if (out_of_process_proxy_.get()) 546 if (out_of_process_proxy_.get())
543 out_of_process_proxy_->AddInstance(instance->pp_instance()); 547 out_of_process_proxy_->AddInstance(instance->pp_instance());
544 return instance; 548 return instance;
545 } 549 }
546 550
547 PluginInstance* PluginModule::GetSomeInstance() const { 551 PluginInstance* PluginModule::GetSomeInstance() const {
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
615 int retval = entry_points.initialize_module(pp_module(), &GetInterface); 619 int retval = entry_points.initialize_module(pp_module(), &GetInterface);
616 if (retval != 0) { 620 if (retval != 0) {
617 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval; 621 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval;
618 return false; 622 return false;
619 } 623 }
620 return true; 624 return true;
621 } 625 }
622 626
623 } // namespace ppapi 627 } // namespace ppapi
624 } // namespace webkit 628 } // namespace webkit
OLDNEW
« no previous file with comments | « webkit/plugins/ppapi/plugin_module.h ('k') | webkit/plugins/ppapi/ppapi_plugin_instance.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698