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

Unified Diff: content/browser/renderer_host/pepper/browser_ppapi_host_impl.cc

Issue 11437038: Revert 171408 (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 side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/pepper/browser_ppapi_host_impl.cc
diff --git a/content/browser/renderer_host/pepper/browser_ppapi_host_impl.cc b/content/browser/renderer_host/pepper/browser_ppapi_host_impl.cc
index d7faf83eb2fff2d2ec920970e15b957a9d52167f..3e074c41db1ab0ffb27500bc31a3d0d07cd4392d 100644
--- a/content/browser/renderer_host/pepper/browser_ppapi_host_impl.cc
+++ b/content/browser/renderer_host/pepper/browser_ppapi_host_impl.cc
@@ -3,8 +3,8 @@
// found in the LICENSE file.
#include "content/browser/renderer_host/pepper/browser_ppapi_host_impl.h"
-
#include "content/browser/renderer_host/pepper/pepper_message_filter.h"
+
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/render_view_host.h"
#include "ipc/ipc_message_macros.h"
@@ -16,19 +16,12 @@ BrowserPpapiHost* BrowserPpapiHost::CreateExternalPluginProcess(
IPC::Sender* sender,
ppapi::PpapiPermissions permissions,
base::ProcessHandle plugin_child_process,
- int plugin_child_process_id,
IPC::ChannelProxy* channel,
net::HostResolver* host_resolver,
int render_process_id,
int render_view_id) {
- // TODO(raymes): Figure out how to plumb plugin_name and
- // profile_data_directory through for NaCl. They are currently only needed for
- // PPB_Flash_File interfaces so it doesn't matter.
- std::string plugin_name;
- FilePath profile_data_directory;
BrowserPpapiHostImpl* browser_ppapi_host =
- new BrowserPpapiHostImpl(sender, permissions, plugin_name,
- profile_data_directory, plugin_child_process_id);
+ new BrowserPpapiHostImpl(sender, permissions);
browser_ppapi_host->set_plugin_process_handle(plugin_child_process);
channel->AddFilter(
@@ -44,15 +37,9 @@ BrowserPpapiHost* BrowserPpapiHost::CreateExternalPluginProcess(
BrowserPpapiHostImpl::BrowserPpapiHostImpl(
IPC::Sender* sender,
- const ppapi::PpapiPermissions& permissions,
- const std::string& plugin_name,
- const FilePath& profile_data_directory,
- int plugin_process_id)
+ const ppapi::PpapiPermissions& permissions)
: ppapi_host_(sender, permissions),
- plugin_process_handle_(base::kNullProcessHandle),
- plugin_name_(plugin_name),
- profile_data_directory_(profile_data_directory),
- plugin_process_id_(plugin_process_id) {
+ plugin_process_handle_(base::kNullProcessHandle) {
message_filter_ = new HostMessageFilter(&ppapi_host_);
ppapi_host_.AddHostFactoryFilter(scoped_ptr<ppapi::host::HostFactory>(
new ContentBrowserPepperHostFactory(this)));
@@ -93,18 +80,6 @@ bool BrowserPpapiHostImpl::GetRenderViewIDsForInstance(
return true;
}
-const std::string& BrowserPpapiHostImpl::GetPluginName() {
- return plugin_name_;
-}
-
-const FilePath& BrowserPpapiHostImpl::GetProfileDataDirectory() {
- return profile_data_directory_;
-}
-
-int BrowserPpapiHostImpl::GetPluginProcessID() {
- return plugin_process_id_;
-}
-
void BrowserPpapiHostImpl::AddInstanceForView(PP_Instance instance,
int render_process_id,
int render_view_id) {

Powered by Google App Engine
This is Rietveld 408576698