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

Side by Side Diff: content/renderer/pepper/plugin_module.cc

Issue 357203003: Move webpreferences.* from webkit/ to content/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: android fix - webview() -> web_view Created 6 years, 5 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
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 "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"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/message_loop/message_loop.h" 13 #include "base/message_loop/message_loop.h"
14 #include "base/message_loop/message_loop_proxy.h" 14 #include "base/message_loop/message_loop_proxy.h"
15 #include "base/time/time.h" 15 #include "base/time/time.h"
16 #include "build/build_config.h" 16 #include "build/build_config.h"
17 #include "content/common/view_messages.h" 17 #include "content/common/view_messages.h"
18 #include "content/public/renderer/content_renderer_client.h" 18 #include "content/public/renderer/content_renderer_client.h"
19 #include "content/renderer/pepper/common.h" 19 #include "content/renderer/pepper/common.h"
20 #include "content/renderer/pepper/host_dispatcher_wrapper.h" 20 #include "content/renderer/pepper/host_dispatcher_wrapper.h"
21 #include "content/renderer/pepper/host_globals.h" 21 #include "content/renderer/pepper/host_globals.h"
22 #include "content/renderer/pepper/pepper_hung_plugin_filter.h" 22 #include "content/renderer/pepper/pepper_hung_plugin_filter.h"
23 #include "content/renderer/pepper/pepper_plugin_instance_impl.h" 23 #include "content/renderer/pepper/pepper_plugin_instance_impl.h"
24 #include "content/renderer/pepper/pepper_plugin_registry.h" 24 #include "content/renderer/pepper/pepper_plugin_registry.h"
25 #include "content/renderer/pepper/ppapi_preferences_builder.h"
25 #include "content/renderer/pepper/ppb_image_data_impl.h" 26 #include "content/renderer/pepper/ppb_image_data_impl.h"
26 #include "content/renderer/pepper/ppb_proxy_impl.h" 27 #include "content/renderer/pepper/ppb_proxy_impl.h"
27 #include "content/renderer/pepper/ppb_scrollbar_impl.h" 28 #include "content/renderer/pepper/ppb_scrollbar_impl.h"
28 #include "content/renderer/pepper/ppb_var_deprecated_impl.h" 29 #include "content/renderer/pepper/ppb_var_deprecated_impl.h"
29 #include "content/renderer/pepper/ppb_video_decoder_impl.h" 30 #include "content/renderer/pepper/ppb_video_decoder_impl.h"
30 #include "content/renderer/pepper/renderer_ppapi_host_impl.h" 31 #include "content/renderer/pepper/renderer_ppapi_host_impl.h"
31 #include "content/renderer/render_view_impl.h" 32 #include "content/renderer/render_view_impl.h"
32 #include "ppapi/c/dev/ppb_audio_input_dev.h" 33 #include "ppapi/c/dev/ppb_audio_input_dev.h"
33 #include "ppapi/c/dev/ppb_buffer_dev.h" 34 #include "ppapi/c/dev/ppb_buffer_dev.h"
34 #include "ppapi/c/dev/ppb_char_set_dev.h" 35 #include "ppapi/c/dev/ppb_char_set_dev.h"
(...skipping 578 matching lines...) Expand 10 before | Expand all | Expand 10 after
613 const base::FilePath& path, 614 const base::FilePath& path,
614 ppapi::PpapiPermissions permissions, 615 ppapi::PpapiPermissions permissions,
615 const IPC::ChannelHandle& channel_handle, 616 const IPC::ChannelHandle& channel_handle,
616 base::ProcessId peer_pid, 617 base::ProcessId peer_pid,
617 int plugin_child_id, 618 int plugin_child_id,
618 bool is_external) { 619 bool is_external) {
619 scoped_refptr<PepperHungPluginFilter> hung_filter(new PepperHungPluginFilter( 620 scoped_refptr<PepperHungPluginFilter> hung_filter(new PepperHungPluginFilter(
620 path, render_frame->GetRoutingID(), plugin_child_id)); 621 path, render_frame->GetRoutingID(), plugin_child_id));
621 scoped_ptr<HostDispatcherWrapper> dispatcher(new HostDispatcherWrapper( 622 scoped_ptr<HostDispatcherWrapper> dispatcher(new HostDispatcherWrapper(
622 this, peer_pid, plugin_child_id, permissions, is_external)); 623 this, peer_pid, plugin_child_id, permissions, is_external));
623 if (!dispatcher->Init( 624 if (!dispatcher->Init(channel_handle,
624 channel_handle, 625 &GetInterface,
625 &GetInterface, 626 ppapi::Preferences(PpapiPreferencesBuilder::Build(
626 ppapi::Preferences(render_frame->render_view()->webkit_preferences()), 627 render_frame->render_view()->webkit_preferences())),
627 hung_filter.get())) 628 hung_filter.get()))
628 return NULL; 629 return NULL;
629 630
630 RendererPpapiHostImpl* host_impl = 631 RendererPpapiHostImpl* host_impl =
631 RendererPpapiHostImpl::CreateOnModuleForOutOfProcess( 632 RendererPpapiHostImpl::CreateOnModuleForOutOfProcess(
632 this, dispatcher->dispatcher(), permissions); 633 this, dispatcher->dispatcher(), permissions);
633 render_frame->PepperPluginCreated(host_impl); 634 render_frame->PepperPluginCreated(host_impl);
634 635
635 InitAsProxied(dispatcher.release()); 636 InitAsProxied(dispatcher.release());
636 return host_impl; 637 return host_impl;
637 } 638 }
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
713 channel_handle, 714 channel_handle,
714 peer_pid, 715 peer_pid,
715 plugin_child_id, 716 plugin_child_id,
716 false)) // is_external = false 717 false)) // is_external = false
717 return scoped_refptr<PluginModule>(); 718 return scoped_refptr<PluginModule>();
718 719
719 return module; 720 return module;
720 } 721 }
721 722
722 } // namespace content 723 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/pepper/pepper_plugin_instance_impl.cc ('k') | content/renderer/pepper/ppapi_preferences_builder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698