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

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

Issue 126083002: Pepper: Remove BrowserPpapiHostImpl::in_process(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix CHECK condition Created 6 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/renderer_host/pepper/browser_ppapi_host_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/pepper/pepper_file_io_host.cc
diff --git a/content/browser/renderer_host/pepper/pepper_file_io_host.cc b/content/browser/renderer_host/pepper/pepper_file_io_host.cc
index 6fe68dea6acdc533f90ae0805b4fb9079ab2033e..ea902e0aa33530280e3e055e7fdeda374b43d097 100644
--- a/content/browser/renderer_host/pepper/pepper_file_io_host.cc
+++ b/content/browser/renderer_host/pepper/pepper_file_io_host.cc
@@ -453,13 +453,11 @@ void PepperFileIOHost::SendOpenErrorReply(
bool PepperFileIOHost::AddFileToReplyContext(
int32_t open_flags,
ppapi::host::ReplyMessageContext* reply_context) const {
- base::ProcessId plugin_process_id;
- if (browser_ppapi_host_->in_process()) {
+ base::ProcessId plugin_process_id =
+ base::GetProcId(browser_ppapi_host_->GetPluginProcessHandle());
+ if (plugin_process_id == base::kNullProcessId)
plugin_process_id = resolved_render_process_id_;
- } else {
- plugin_process_id = base::GetProcId(
- browser_ppapi_host_->GetPluginProcessHandle());
- }
+
IPC::PlatformFileForTransit transit_file = BrokerGetFileHandleForProcess(
file_, plugin_process_id, false);
if (transit_file == IPC::InvalidPlatformFileForTransit())
« no previous file with comments | « content/browser/renderer_host/pepper/browser_ppapi_host_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698