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

Side by Side Diff: content/shell/shell_browser_context.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
« no previous file with comments | « content/shell/shell_browser_context.h ('k') | no next file » | no next file with comments »
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/shell/shell_browser_context.h" 5 #include "content/shell/shell_browser_context.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/environment.h" 9 #include "base/environment.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 return url_request_getter_; 97 return url_request_getter_;
98 } 98 }
99 99
100 net::URLRequestContextGetter* 100 net::URLRequestContextGetter*
101 ShellBrowserContext::GetRequestContextForRenderProcess( 101 ShellBrowserContext::GetRequestContextForRenderProcess(
102 int renderer_child_id) { 102 int renderer_child_id) {
103 return GetRequestContext(); 103 return GetRequestContext();
104 } 104 }
105 105
106 net::URLRequestContextGetter* 106 net::URLRequestContextGetter*
107 ShellBrowserContext::GetRequestContextForMedia() { 107 ShellBrowserContext::GetMediaRequestContext() {
108 return GetRequestContext(); 108 return GetRequestContext();
109 } 109 }
110 110
111 net::URLRequestContextGetter*
112 ShellBrowserContext::GetMediaRequestContextForRenderProcess(
113 int renderer_child_id) {
114 return GetRequestContext();
115 }
116
111 ResourceContext* ShellBrowserContext::GetResourceContext() { 117 ResourceContext* ShellBrowserContext::GetResourceContext() {
112 if (!resource_context_.get()) { 118 if (!resource_context_.get()) {
113 resource_context_.reset(new ShellResourceContext( 119 resource_context_.reset(new ShellResourceContext(
114 static_cast<ShellURLRequestContextGetter*>(GetRequestContext()))); 120 static_cast<ShellURLRequestContextGetter*>(GetRequestContext())));
115 } 121 }
116 return resource_context_.get(); 122 return resource_context_.get();
117 } 123 }
118 124
119 GeolocationPermissionContext* 125 GeolocationPermissionContext*
120 ShellBrowserContext::GetGeolocationPermissionContext() { 126 ShellBrowserContext::GetGeolocationPermissionContext() {
121 return NULL; 127 return NULL;
122 } 128 }
123 129
124 SpeechRecognitionPreferences* 130 SpeechRecognitionPreferences*
125 ShellBrowserContext::GetSpeechRecognitionPreferences() { 131 ShellBrowserContext::GetSpeechRecognitionPreferences() {
126 return NULL; 132 return NULL;
127 } 133 }
128 134
129 bool ShellBrowserContext::DidLastSessionExitCleanly() { 135 bool ShellBrowserContext::DidLastSessionExitCleanly() {
130 return true; 136 return true;
131 } 137 }
132 138
133 quota::SpecialStoragePolicy* ShellBrowserContext::GetSpecialStoragePolicy() { 139 quota::SpecialStoragePolicy* ShellBrowserContext::GetSpecialStoragePolicy() {
134 return NULL; 140 return NULL;
135 } 141 }
136 142
137 } // namespace content 143 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/shell_browser_context.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698