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

Side by Side Diff: content/browser/loader/resource_request_info_impl.cc

Issue 23503043: Load NPAPI plugin resources through the browser process directly instead of going through the render (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync Created 7 years, 3 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | content/browser/plugin_process_host.h » ('j') | content/plugin/webplugin_proxy.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/loader/resource_request_info_impl.h" 5 #include "content/browser/loader/resource_request_info_impl.h"
6 6
7 #include "content/browser/loader/global_routing_id.h" 7 #include "content/browser/loader/global_routing_id.h"
8 #include "content/browser/worker_host/worker_service_impl.h" 8 #include "content/browser/worker_host/worker_service_impl.h"
9 #include "content/common/net/url_request_user_data.h" 9 #include "content/common/net/url_request_user_data.h"
10 #include "content/public/browser/global_request_id.h" 10 #include "content/public/browser/global_request_id.h"
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 // worker. 188 // worker.
189 if (process_type_ == PROCESS_TYPE_WORKER) { 189 if (process_type_ == PROCESS_TYPE_WORKER) {
190 // Need to display some related UI for this network request - pick an 190 // Need to display some related UI for this network request - pick an
191 // arbitrary parent to do so. 191 // arbitrary parent to do so.
192 if (!WorkerServiceImpl::GetInstance()->GetRendererForWorker( 192 if (!WorkerServiceImpl::GetInstance()->GetRendererForWorker(
193 child_id_, render_process_id, render_view_id)) { 193 child_id_, render_process_id, render_view_id)) {
194 *render_process_id = -1; 194 *render_process_id = -1;
195 *render_view_id = -1; 195 *render_view_id = -1;
196 return false; 196 return false;
197 } 197 }
198 } else if (process_type_ == PROCESS_TYPE_PLUGIN) {
199 *render_process_id = origin_pid_;
200 *render_view_id = route_id_;
198 } else { 201 } else {
199 *render_process_id = child_id_; 202 *render_process_id = child_id_;
200 *render_view_id = route_id_; 203 *render_view_id = route_id_;
201 } 204 }
202 return true; 205 return true;
203 } 206 }
204 207
205 bool ResourceRequestInfoImpl::IsAsync() const { 208 bool ResourceRequestInfoImpl::IsAsync() const {
206 return is_async_; 209 return is_async_;
207 } 210 }
(...skipping 11 matching lines...) Expand all
219 222
220 GlobalRequestID ResourceRequestInfoImpl::GetGlobalRequestID() const { 223 GlobalRequestID ResourceRequestInfoImpl::GetGlobalRequestID() const {
221 return GlobalRequestID(child_id_, request_id_); 224 return GlobalRequestID(child_id_, request_id_);
222 } 225 }
223 226
224 GlobalRoutingID ResourceRequestInfoImpl::GetGlobalRoutingID() const { 227 GlobalRoutingID ResourceRequestInfoImpl::GetGlobalRoutingID() const {
225 return GlobalRoutingID(child_id_, route_id_); 228 return GlobalRoutingID(child_id_, route_id_);
226 } 229 }
227 230
228 } // namespace content 231 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/plugin_process_host.h » ('j') | content/plugin/webplugin_proxy.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698