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 "content/renderer/pepper/plugin_module.h" | 5 #include "content/renderer/pepper/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 619 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
630 | 630 |
631 RendererPpapiHostImpl* PluginModule::CreateOutOfProcessModule( | 631 RendererPpapiHostImpl* PluginModule::CreateOutOfProcessModule( |
632 RenderFrameImpl* render_frame, | 632 RenderFrameImpl* render_frame, |
633 const base::FilePath& path, | 633 const base::FilePath& path, |
634 ppapi::PpapiPermissions permissions, | 634 ppapi::PpapiPermissions permissions, |
635 const IPC::ChannelHandle& channel_handle, | 635 const IPC::ChannelHandle& channel_handle, |
636 base::ProcessId peer_pid, | 636 base::ProcessId peer_pid, |
637 int plugin_child_id, | 637 int plugin_child_id, |
638 bool is_external) { | 638 bool is_external) { |
639 scoped_refptr<PepperHungPluginFilter> hung_filter(new PepperHungPluginFilter( | 639 scoped_refptr<PepperHungPluginFilter> hung_filter(new PepperHungPluginFilter( |
640 path, render_frame->routing_id(), plugin_child_id)); | 640 path, render_frame->GetRoutingID(), plugin_child_id)); |
641 scoped_ptr<HostDispatcherWrapper> dispatcher( | 641 scoped_ptr<HostDispatcherWrapper> dispatcher( |
642 new HostDispatcherWrapper(this, | 642 new HostDispatcherWrapper(this, |
643 peer_pid, | 643 peer_pid, |
644 plugin_child_id, | 644 plugin_child_id, |
645 permissions, | 645 permissions, |
646 is_external)); | 646 is_external)); |
647 if (!dispatcher->Init( | 647 if (!dispatcher->Init( |
648 channel_handle, | 648 channel_handle, |
649 &GetInterface, | 649 &GetInterface, |
650 ppapi::Preferences(render_frame->render_view()->webkit_preferences()), | 650 ppapi::Preferences(render_frame->render_view()->webkit_preferences()), |
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
736 channel_handle, | 736 channel_handle, |
737 peer_pid, | 737 peer_pid, |
738 plugin_child_id, | 738 plugin_child_id, |
739 false)) // is_external = false | 739 false)) // is_external = false |
740 return scoped_refptr<PluginModule>(); | 740 return scoped_refptr<PluginModule>(); |
741 | 741 |
742 return module; | 742 return module; |
743 } | 743 } |
744 | 744 |
745 } // namespace content | 745 } // namespace content |
OLD | NEW |