summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorvictorhsieh@chromium.org <victorhsieh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-29 22:33:49 +0000
committervictorhsieh@chromium.org <victorhsieh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-29 22:33:49 +0000
commit7bb5d2c279c73089a99c283fdf993c08e2b1f50b (patch)
treef65d20906349a4352cb881e6504283116ab272a8 /content
parentc791fa60e18bf1258b2a4f407a0f1b57cf58b00b (diff)
downloadchromium_src-7bb5d2c279c73089a99c283fdf993c08e2b1f50b.zip
chromium_src-7bb5d2c279c73089a99c283fdf993c08e2b1f50b.tar.gz
chromium_src-7bb5d2c279c73089a99c283fdf993c08e2b1f50b.tar.bz2
Pass profile directory to NaClProcessHost
Profile directory is passed correctly in pure plugin, but not NaCl. BrowserPpapiHostImpl didn't have a real profile directory. The real value is now passed from ChromeRenderMessageFilter::OnLaunchNaCl -> NaClProcessHost -> BrowserPpapiHostImpl. BUG=235072 Review URL: https://chromiumcodereview.appspot.com/14475010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197166 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/renderer_host/pepper/browser_ppapi_host_impl.cc11
-rw-r--r--content/public/browser/browser_ppapi_host.h3
2 files changed, 7 insertions, 7 deletions
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 ff4284a..4fcbcf2 100644
--- a/content/browser/renderer_host/pepper/browser_ppapi_host_impl.cc
+++ b/content/browser/renderer_host/pepper/browser_ppapi_host_impl.cc
@@ -21,15 +21,14 @@ BrowserPpapiHost* BrowserPpapiHost::CreateExternalPluginProcess(
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.
+ int render_view_id,
+ const base::FilePath& profile_directory) {
+ // TODO(raymes): Figure out how to plumb plugin_name through for NaCl. It is
+ // currently only needed for PPB_Flash_File interfaces so it doesn't matter.
std::string plugin_name;
- base::FilePath profile_data_directory;
BrowserPpapiHostImpl* browser_ppapi_host =
new BrowserPpapiHostImpl(sender, permissions, plugin_name,
- profile_data_directory,
+ profile_directory,
true);
browser_ppapi_host->set_plugin_process_handle(plugin_child_process);
diff --git a/content/public/browser/browser_ppapi_host.h b/content/public/browser/browser_ppapi_host.h
index d23908e..b831e09 100644
--- a/content/public/browser/browser_ppapi_host.h
+++ b/content/public/browser/browser_ppapi_host.h
@@ -47,7 +47,8 @@ class CONTENT_EXPORT BrowserPpapiHost {
IPC::ChannelProxy* channel,
net::HostResolver* host_resolver,
int render_process_id,
- int render_view_id);
+ int render_view_id,
+ const base::FilePath& profile_directory);
virtual ~BrowserPpapiHost() {}