From a245006a5f6f1c5abc7f3f7aecc56444847bfa48 Mon Sep 17 00:00:00 2001 From: "raymes@chromium.org" Date: Tue, 11 Jun 2013 21:36:05 +0000 Subject: Implement GetVoucherFile and GetHmonitor functions for PPB_Flash_DRM This adds 2 functions to PPB_Flash_DRM which are used for Flash DRM-related features. GetVoucherFile() returns a FileRef to a flash voucher file. This file will be dropped in to the tree next to the flash DLL and will be named plugin.vch. GetHmonitor returns the HMONITOR (on windows only) associated with the monitor displaying the instance. cpu@ will implement the backend for this. BUG=242241 R=cpu@chromium.org, jam@chromium.org, jschuh@chromium.org, yzshen@chromium.org Review URL: https://codereview.chromium.org/15079003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205640 0039d316-1c4b-4281-b951-d872f2087c98 --- content/browser/ppapi_plugin_process_host.cc | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'content/browser/ppapi_plugin_process_host.cc') diff --git a/content/browser/ppapi_plugin_process_host.cc b/content/browser/ppapi_plugin_process_host.cc index 73de9c1..093a08b 100644 --- a/content/browser/ppapi_plugin_process_host.cc +++ b/content/browser/ppapi_plugin_process_host.cc @@ -218,7 +218,7 @@ PpapiPluginProcessHost::PpapiPluginProcessHost( filter_ = new PepperMessageFilter(permissions_, host_resolver); host_impl_.reset(new BrowserPpapiHostImpl(this, permissions_, info.name, - profile_data_directory, + info.path, profile_data_directory, false)); process_->GetHost()->AddFilter(filter_.get()); @@ -237,12 +237,11 @@ PpapiPluginProcessHost::PpapiPluginProcessHost() PROCESS_TYPE_PPAPI_BROKER, this)); ppapi::PpapiPermissions permissions; // No permissions. - // The plugin name and profile data directory shouldn't be needed for the - // broker. - std::string plugin_name; - base::FilePath profile_data_directory; - host_impl_.reset(new BrowserPpapiHostImpl(this, permissions, plugin_name, - profile_data_directory, + // The plugin name, path and profile data directory shouldn't be needed for + // the broker. + host_impl_.reset(new BrowserPpapiHostImpl(this, permissions, + std::string(), base::FilePath(), + base::FilePath(), false)); } -- cgit v1.1