Chromium Code Reviews| Index: chrome/browser/net/chrome_url_request_context.h |
| diff --git a/chrome/browser/net/chrome_url_request_context.h b/chrome/browser/net/chrome_url_request_context.h |
| index 1f1b09c74abe4b1043382f9e17e582639a507946..b6231a657398dec3e5e36c3ad52a65c87099a5f0 100644 |
| --- a/chrome/browser/net/chrome_url_request_context.h |
| +++ b/chrome/browser/net/chrome_url_request_context.h |
| @@ -47,6 +47,9 @@ class ChromeURLRequestContext : public net::URLRequestContext { |
| public: |
| ChromeURLRequestContext(); |
| + // Copies the state from |other| into this context. |
| + void CopyFrom(ChromeURLRequestContext* other); |
| + |
| // Gets the path to the directory user scripts are stored in. |
| FilePath user_script_dir_path() const { |
| return user_script_dir_path_; |
| @@ -140,6 +143,11 @@ class ChromeURLRequestContext : public net::URLRequestContext { |
| virtual ~ChromeURLRequestContext(); |
| private: |
| + // --------------------------------------------------------------------------- |
| + // Important: When adding any new members below, consider whether they need to |
| + // be added to CopyFrom. |
| + // --------------------------------------------------------------------------- |
| + |
| // Path to the directory user scripts are stored in. |
| FilePath user_script_dir_path_; |
| @@ -158,6 +166,11 @@ class ChromeURLRequestContext : public net::URLRequestContext { |
| bool is_off_the_record_; |
| + // --------------------------------------------------------------------------- |
| + // Important: When adding any new members above, consider whether they need to |
| + // be added to CopyFrom. |
| + // --------------------------------------------------------------------------- |
| + |
| DISALLOW_COPY_AND_ASSIGN(ChromeURLRequestContext); |
| }; |
| @@ -213,6 +226,13 @@ class ChromeURLRequestContextGetter : public URLRequestContextGetter, |
| static ChromeURLRequestContextGetter* CreateOriginalForExtensions( |
| Profile* profile, const ProfileIOData* profile_io_data); |
| + // Create an instance for an original profile for an app with isolated |
| + // storage. This is expected to get called on UI thread. |
| + static ChromeURLRequestContextGetter* CreateOriginalForIsolatedApp( |
| + Profile* profile, |
| + const ProfileIOData* profile_io_data, |
| + std::string app_id); |
|
Matt Perry
2011/03/15 00:40:56
const std::string&, and below
Charlie Reis
2011/03/15 06:23:42
Done.
|
| + |
| // Create an instance for use with an OTR profile. This is expected to get |
| // called on the UI thread. |
| static ChromeURLRequestContextGetter* CreateOffTheRecord( |
| @@ -223,6 +243,13 @@ class ChromeURLRequestContextGetter : public URLRequestContextGetter, |
| static ChromeURLRequestContextGetter* CreateOffTheRecordForExtensions( |
| Profile* profile, const ProfileIOData* profile_io_data); |
| + // Create an instance for an OTR profile for an app with isolated storage. |
| + // This is expected to get called on UI thread. |
| + static ChromeURLRequestContextGetter* CreateOffTheRecordForIsolatedApp( |
| + Profile* profile, |
| + const ProfileIOData* profile_io_data, |
| + std::string app_id); |
| + |
| // Clean up UI thread resources. This is expected to get called on the UI |
| // thread before the instance is deleted on the IO thread. |
| void CleanupOnUIThread(); |