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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/profiles/off_the_record_profile_impl.cc
diff --git a/chrome/browser/profiles/off_the_record_profile_impl.cc b/chrome/browser/profiles/off_the_record_profile_impl.cc
index c50d8447fc9b96f65024b76fd8b4add013ef9d08..4c0b81b2ef0f7acca2fbbca547a393588a7b394f 100644
--- a/chrome/browser/profiles/off_the_record_profile_impl.cc
+++ b/chrome/browser/profiles/off_the_record_profile_impl.cc
@@ -281,9 +281,16 @@ net::URLRequestContextGetter*
}
net::URLRequestContextGetter*
- OffTheRecordProfileImpl::GetRequestContextForMedia() {
+ OffTheRecordProfileImpl::GetMediaRequestContext() {
// In OTR mode, media request context is the same as the original one.
- return io_data_.GetMainRequestContextGetter();
+ return GetRequestContext();
+}
+
+net::URLRequestContextGetter*
+ OffTheRecordProfileImpl::GetMediaRequestContextForRenderProcess(
+ int renderer_child_id) {
+ // In OTR mode, media request context is the same as the original one.
+ return GetRequestContextForRenderProcess(renderer_child_id);
}
net::URLRequestContextGetter*
« 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