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

Side by Side Diff: chrome/browser/profiles/off_the_record_profile_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 #include "chrome/browser/profiles/off_the_record_profile_impl.h" 5 #include "chrome/browser/profiles/off_the_record_profile_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 // non-persistent context using the RPH's id. 274 // non-persistent context using the RPH's id.
275 std::string id("guest-"); 275 std::string id("guest-");
276 id.append(base::IntToString(renderer_child_id)); 276 id.append(base::IntToString(renderer_child_id));
277 return GetRequestContextForIsolatedApp(id); 277 return GetRequestContextForIsolatedApp(id);
278 } 278 }
279 279
280 return GetRequestContext(); 280 return GetRequestContext();
281 } 281 }
282 282
283 net::URLRequestContextGetter* 283 net::URLRequestContextGetter*
284 OffTheRecordProfileImpl::GetRequestContextForMedia() { 284 OffTheRecordProfileImpl::GetMediaRequestContext() {
285 // In OTR mode, media request context is the same as the original one. 285 // In OTR mode, media request context is the same as the original one.
286 return io_data_.GetMainRequestContextGetter(); 286 return GetRequestContext();
287 } 287 }
288 288
289 net::URLRequestContextGetter* 289 net::URLRequestContextGetter*
290 OffTheRecordProfileImpl::GetMediaRequestContextForRenderProcess(
291 int renderer_child_id) {
292 // In OTR mode, media request context is the same as the original one.
293 return GetRequestContextForRenderProcess(renderer_child_id);
294 }
295
296 net::URLRequestContextGetter*
290 OffTheRecordProfileImpl::GetRequestContextForExtensions() { 297 OffTheRecordProfileImpl::GetRequestContextForExtensions() {
291 return io_data_.GetExtensionsRequestContextGetter(); 298 return io_data_.GetExtensionsRequestContextGetter();
292 } 299 }
293 300
294 net::URLRequestContextGetter* 301 net::URLRequestContextGetter*
295 OffTheRecordProfileImpl::GetRequestContextForIsolatedApp( 302 OffTheRecordProfileImpl::GetRequestContextForIsolatedApp(
296 const std::string& app_id) { 303 const std::string& app_id) {
297 return io_data_.GetIsolatedAppRequestContextGetter(app_id); 304 return io_data_.GetIsolatedAppRequestContextGetter(app_id);
298 } 305 }
299 306
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
470 if (!profile) 477 if (!profile)
471 profile = new OffTheRecordProfileImpl(this); 478 profile = new OffTheRecordProfileImpl(this);
472 profile->Init(); 479 profile->Init();
473 return profile; 480 return profile;
474 } 481 }
475 482
476 base::Callback<ChromeURLDataManagerBackend*(void)> 483 base::Callback<ChromeURLDataManagerBackend*(void)>
477 OffTheRecordProfileImpl::GetChromeURLDataManagerBackendGetter() const { 484 OffTheRecordProfileImpl::GetChromeURLDataManagerBackendGetter() const {
478 return io_data_.GetChromeURLDataManagerBackendGetter(); 485 return io_data_.GetChromeURLDataManagerBackendGetter();
479 } 486 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/off_the_record_profile_impl.h ('k') | chrome/browser/profiles/off_the_record_profile_io_data.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698