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

Side by Side Diff: content/browser/renderer_host/render_process_host_impl.cc

Issue 10836305: Ensure that isolated apps use the right cookies for media requests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge conflict. Created 8 years, 4 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
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 // Represents the browser side of the browser <--> renderer communication 5 // Represents the browser side of the browser <--> renderer communication
6 // channel. There will be one RenderProcessHost per renderer process. 6 // channel. There will be one RenderProcessHost per renderer process.
7 7
8 #include "content/browser/renderer_host/render_process_host_impl.h" 8 #include "content/browser/renderer_host/render_process_host_impl.h"
9 9
10 #if defined(OS_WIN) 10 #if defined(OS_WIN)
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 181
182 // Helper class that we pass to ResourceMessageFilter so that it can find the 182 // Helper class that we pass to ResourceMessageFilter so that it can find the
183 // right net::URLRequestContext for a request. 183 // right net::URLRequestContext for a request.
184 class RendererURLRequestContextSelector 184 class RendererURLRequestContextSelector
185 : public ResourceMessageFilter::URLRequestContextSelector { 185 : public ResourceMessageFilter::URLRequestContextSelector {
186 public: 186 public:
187 RendererURLRequestContextSelector(BrowserContext* browser_context, 187 RendererURLRequestContextSelector(BrowserContext* browser_context,
188 int render_child_id) 188 int render_child_id)
189 : request_context_(browser_context->GetRequestContextForRenderProcess( 189 : request_context_(browser_context->GetRequestContextForRenderProcess(
190 render_child_id)), 190 render_child_id)),
191 media_request_context_(browser_context->GetRequestContextForMedia()) { 191 media_request_context_(
192 browser_context->GetMediaRequestContextForRenderProcess(
193 render_child_id)) {
192 } 194 }
193 195
194 virtual net::URLRequestContext* GetRequestContext( 196 virtual net::URLRequestContext* GetRequestContext(
195 ResourceType::Type resource_type) { 197 ResourceType::Type resource_type) {
196 net::URLRequestContextGetter* request_context = request_context_; 198 net::URLRequestContextGetter* request_context = request_context_;
197 // If the request has resource type of ResourceType::MEDIA, we use a request 199 // If the request has resource type of ResourceType::MEDIA, we use a request
198 // context specific to media for handling it because these resources have 200 // context specific to media for handling it because these resources have
199 // specific needs for caching. 201 // specific needs for caching.
200 if (resource_type == ResourceType::MEDIA) 202 if (resource_type == ResourceType::MEDIA)
201 request_context = media_request_context_; 203 request_context = media_request_context_;
(...skipping 1311 matching lines...) Expand 10 before | Expand all | Expand 10 after
1513 int32 route_id, 1515 int32 route_id,
1514 int32 gpu_process_host_id) { 1516 int32 gpu_process_host_id) {
1515 TRACE_EVENT0("renderer_host", 1517 TRACE_EVENT0("renderer_host",
1516 "RenderWidgetHostImpl::OnCompositorSurfaceBuffersSwappedNoHost"); 1518 "RenderWidgetHostImpl::OnCompositorSurfaceBuffersSwappedNoHost");
1517 RenderWidgetHostImpl::AcknowledgeBufferPresent(route_id, 1519 RenderWidgetHostImpl::AcknowledgeBufferPresent(route_id,
1518 gpu_process_host_id, 1520 gpu_process_host_id,
1519 0); 1521 0);
1520 } 1522 }
1521 1523
1522 } // namespace content 1524 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/download/download_manager_impl_unittest.cc ('k') | content/browser/resource_context_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698