diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-06 17:14:25 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-06 17:14:25 +0000 |
| commit | 5af71dcc519ea54785956b6d43dfb23f8eb966ac (patch) | |
| tree | 9928df888ab3feb19615481ce45aec80f4e81def /content | |
| parent | 18ba2b1b755ee5964255b81297698f395722bf7a (diff) | |
| download | chromium_src-5af71dcc519ea54785956b6d43dfb23f8eb966ac.zip chromium_src-5af71dcc519ea54785956b6d43dfb23f8eb966ac.tar.gz chromium_src-5af71dcc519ea54785956b6d43dfb23f8eb966ac.tar.bz2 | |
Don't pass RDH to plugin process hosts.
This helps eliminate the need to construct a ResourceMessageFilter for these process hosts.
This is important since ResourceMessageFilters will need to take a per-profile object containing the data necessary to load resources.
BUG=78596
TEST=none
Review URL: http://codereview.chromium.org/6792067
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80640 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/plugin_process_host.cc | 4 | ||||
| -rw-r--r-- | content/browser/plugin_service.cc | 1 | ||||
| -rw-r--r-- | content/browser/plugin_service.h | 7 | ||||
| -rw-r--r-- | content/browser/ppapi_plugin_process_host.cc | 4 |
4 files changed, 2 insertions, 14 deletions
diff --git a/content/browser/plugin_process_host.cc b/content/browser/plugin_process_host.cc index d7a02fb..e12d443 100644 --- a/content/browser/plugin_process_host.cc +++ b/content/browser/plugin_process_host.cc @@ -93,9 +93,7 @@ void PluginProcessHost::OnMapNativeViewId(gfx::NativeViewId id, #endif // defined(TOOLKIT_USES_GTK) PluginProcessHost::PluginProcessHost() - : BrowserChildProcessHost( - PLUGIN_PROCESS, - PluginService::GetInstance()->resource_dispatcher_host()) + : BrowserChildProcessHost(PLUGIN_PROCESS, NULL) #if defined(OS_MACOSX) , plugin_cursor_visible_(true) #endif diff --git a/content/browser/plugin_service.cc b/content/browser/plugin_service.cc index 68e6942..409bd67 100644 --- a/content/browser/plugin_service.cc +++ b/content/browser/plugin_service.cc @@ -82,7 +82,6 @@ PluginService* PluginService::GetInstance() { PluginService::PluginService() : main_message_loop_(MessageLoop::current()), - resource_dispatcher_host_(NULL), ui_locale_(g_browser_process->GetApplicationLocale()) { RegisterPepperPlugins(); diff --git a/content/browser/plugin_service.h b/content/browser/plugin_service.h index 2bc31b7..4943d42 100644 --- a/content/browser/plugin_service.h +++ b/content/browser/plugin_service.h @@ -135,10 +135,6 @@ class PluginService // The UI thread's message loop MessageLoop* main_message_loop() { return main_message_loop_; } - ResourceDispatcherHost* resource_dispatcher_host() const { - return resource_dispatcher_host_; - } - private: friend struct DefaultSingletonTraits<PluginService>; @@ -181,9 +177,6 @@ class PluginService // The main thread's message loop. MessageLoop* main_message_loop_; - // The IO thread's resource dispatcher host. - ResourceDispatcherHost* resource_dispatcher_host_; - // The browser's UI locale. const std::string ui_locale_; diff --git a/content/browser/ppapi_plugin_process_host.cc b/content/browser/ppapi_plugin_process_host.cc index a4505a9..1659450 100644 --- a/content/browser/ppapi_plugin_process_host.cc +++ b/content/browser/ppapi_plugin_process_host.cc @@ -17,9 +17,7 @@ #include "ppapi/proxy/ppapi_messages.h" PpapiPluginProcessHost::PpapiPluginProcessHost() - : BrowserChildProcessHost( - ChildProcessInfo::PPAPI_PLUGIN_PROCESS, - PluginService::GetInstance()->resource_dispatcher_host()) { + : BrowserChildProcessHost(ChildProcessInfo::PPAPI_PLUGIN_PROCESS, NULL) { } PpapiPluginProcessHost::~PpapiPluginProcessHost() { |