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 "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 494 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
505 bool PluginModule::IsProxied() const { | 505 bool PluginModule::IsProxied() const { |
506 return !!out_of_process_proxy_; | 506 return !!out_of_process_proxy_; |
507 } | 507 } |
508 | 508 |
509 base::ProcessId PluginModule::GetPeerProcessId() { | 509 base::ProcessId PluginModule::GetPeerProcessId() { |
510 if (out_of_process_proxy_) | 510 if (out_of_process_proxy_) |
511 return out_of_process_proxy_->GetPeerProcessId(); | 511 return out_of_process_proxy_->GetPeerProcessId(); |
512 return base::kNullProcessId; | 512 return base::kNullProcessId; |
513 } | 513 } |
514 | 514 |
| 515 int PluginModule::GetPluginChildId() { |
| 516 if (out_of_process_proxy_) |
| 517 return out_of_process_proxy_->GetPluginChildId(); |
| 518 return 0; |
| 519 } |
| 520 |
515 // static | 521 // static |
516 const PPB_Core* PluginModule::GetCore() { | 522 const PPB_Core* PluginModule::GetCore() { |
517 return &core_interface; | 523 return &core_interface; |
518 } | 524 } |
519 | 525 |
520 // static | 526 // static |
521 PluginModule::GetInterfaceFunc PluginModule::GetLocalGetInterfaceFunc() { | 527 PluginModule::GetInterfaceFunc PluginModule::GetLocalGetInterfaceFunc() { |
522 return &GetInterface; | 528 return &GetInterface; |
523 } | 529 } |
524 | 530 |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
619 int retval = entry_points.initialize_module(pp_module(), &GetInterface); | 625 int retval = entry_points.initialize_module(pp_module(), &GetInterface); |
620 if (retval != 0) { | 626 if (retval != 0) { |
621 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval; | 627 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval; |
622 return false; | 628 return false; |
623 } | 629 } |
624 return true; | 630 return true; |
625 } | 631 } |
626 | 632 |
627 } // namespace ppapi | 633 } // namespace ppapi |
628 } // namespace webkit | 634 } // namespace webkit |
OLD | NEW |