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

Unified Diff: chrome/browser/profiles/profile_impl_io_data.h

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
« no previous file with comments | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/browser/profiles/profile_impl_io_data.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/profile_impl_io_data.h
diff --git a/chrome/browser/profiles/profile_impl_io_data.h b/chrome/browser/profiles/profile_impl_io_data.h
index 25ffefe0d1c52ab8e2ca73b209549865fb2f9f16..83b21488e1549302432db977aac0a63e23b6eddb 100644
--- a/chrome/browser/profiles/profile_impl_io_data.h
+++ b/chrome/browser/profiles/profile_impl_io_data.h
@@ -66,6 +66,9 @@ class ProfileImplIOData : public ProfileIOData {
scoped_refptr<ChromeURLRequestContextGetter>
GetIsolatedAppRequestContextGetter(
const std::string& app_id) const;
+ scoped_refptr<ChromeURLRequestContextGetter>
+ GetIsolatedMediaRequestContextGetter(
+ const std::string& app_id) const;
void ClearNetworkingHistorySince(base::Time time);
@@ -94,6 +97,8 @@ class ProfileImplIOData : public ProfileIOData {
mutable scoped_refptr<ChromeURLRequestContextGetter>
extensions_request_context_getter_;
mutable ChromeURLRequestContextGetterMap app_request_context_getter_map_;
+ mutable ChromeURLRequestContextGetterMap
+ isolated_media_request_context_getter_map_;
ProfileImplIOData* const io_data_;
Profile* const profile_;
@@ -133,12 +138,19 @@ class ProfileImplIOData : public ProfileIOData {
virtual ChromeURLRequestContext* InitializeAppRequestContext(
ChromeURLRequestContext* main_context,
const std::string& app_id) const OVERRIDE;
+ virtual ChromeURLRequestContext* InitializeMediaRequestContext(
+ ChromeURLRequestContext* original_context,
+ const std::string& app_id) const OVERRIDE;
virtual ChromeURLRequestContext*
AcquireMediaRequestContext() const OVERRIDE;
virtual ChromeURLRequestContext*
AcquireIsolatedAppRequestContext(
ChromeURLRequestContext* main_context,
const std::string& app_id) const OVERRIDE;
+ virtual ChromeURLRequestContext*
+ AcquireIsolatedMediaRequestContext(
+ ChromeURLRequestContext* app_context,
+ const std::string& app_id) const OVERRIDE;
virtual chrome_browser_net::LoadTimeStats* GetLoadTimeStats(
IOThread::Globals* io_thread_globals) const OVERRIDE;
@@ -152,7 +164,6 @@ class ProfileImplIOData : public ProfileIOData {
mutable scoped_ptr<LazyParams> lazy_params_;
mutable scoped_ptr<net::HttpTransactionFactory> main_http_factory_;
- mutable scoped_ptr<net::HttpTransactionFactory> media_http_factory_;
mutable scoped_ptr<net::FtpTransactionFactory> ftp_factory_;
mutable scoped_ptr<chrome_browser_net::Predictor> predictor_;
@@ -165,6 +176,8 @@ class ProfileImplIOData : public ProfileIOData {
// Parameters needed for isolated apps.
FilePath app_path_;
+ int app_cache_max_size_;
+ int app_media_cache_max_size_;
DISALLOW_COPY_AND_ASSIGN(ProfileImplIOData);
};
« no previous file with comments | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/browser/profiles/profile_impl_io_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698