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

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

Issue 11147026: Initial refactor to get profiles to propagate storage partition details. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed macro and InMemory. Created 8 years, 2 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_io_data.h
diff --git a/chrome/browser/profiles/off_the_record_profile_io_data.h b/chrome/browser/profiles/off_the_record_profile_io_data.h
index ca5c304c373f6f19f0b744cffc605ae65fdd741e..a5fec3256d4822de4588642cfe302a27ef8950a9 100644
--- a/chrome/browser/profiles/off_the_record_profile_io_data.h
+++ b/chrome/browser/profiles/off_the_record_profile_io_data.h
@@ -12,6 +12,7 @@
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "chrome/browser/profiles/profile_io_data.h"
+#include "chrome/browser/profiles/storage_partition_descriptor.h"
class ChromeURLRequestContext;
class ChromeURLRequestContextGetter;
@@ -51,12 +52,22 @@ class OffTheRecordProfileIOData : public ProfileIOData {
GetExtensionsRequestContextGetter() const;
scoped_refptr<ChromeURLRequestContextGetter>
GetIsolatedAppRequestContextGetter(
- const std::string& app_id) const;
+ const FilePath& partition_path,
+ bool in_memory) const;
private:
- typedef base::hash_map<std::string,
- scoped_refptr<ChromeURLRequestContextGetter> >
- ChromeURLRequestContextGetterMap;
+#if defined(COMPILER_MSVC)
+ typedef BASE_HASH_NAMESPACE::hash_map<
+ StoragePartitionDescriptor, scoped_refptr<ChromeURLRequestContextGetter>,
+ BASE_HASH_NAMESPACE::hash_compare<StoragePartitionDescriptor,
+ StoragePartitionDescriptorLess> >
+#elif defined(COMPILER_GCC)
+ typedef BASE_HASH_NAMESPACE::hash_map< \
+ StoragePartitionDescriptor, scoped_refptr<ChromeURLRequestContextGetter>,
+ BASE_HASH_NAMESPACE::hash<StoragePartitionDescriptor>,
+ StoragePartitionDescriptorEq>
+#endif
+ ChromeURLRequestContextGetterMap;
// Lazily initialize ProfileParams. We do this on the calls to
// Get*RequestContextGetter(), so we only initialize ProfileParams right
@@ -99,24 +110,25 @@ class OffTheRecordProfileIOData : public ProfileIOData {
ProfileParams* profile_params) const OVERRIDE;
virtual ChromeURLRequestContext* InitializeAppRequestContext(
ChromeURLRequestContext* main_context,
- const std::string& app_id,
+ const StoragePartitionDescriptor& partition_descriptor,
scoped_ptr<net::URLRequestJobFactory::Interceptor>
protocol_handler_interceptor) const OVERRIDE;
virtual ChromeURLRequestContext* InitializeMediaRequestContext(
ChromeURLRequestContext* original_context,
- const std::string& app_id) const OVERRIDE;
+ const StoragePartitionDescriptor& partition_descriptor) const OVERRIDE;
virtual ChromeURLRequestContext*
AcquireMediaRequestContext() const OVERRIDE;
virtual ChromeURLRequestContext*
AcquireIsolatedAppRequestContext(
ChromeURLRequestContext* main_context,
- const std::string& app_id,
+ const StoragePartitionDescriptor& partition_descriptor,
scoped_ptr<net::URLRequestJobFactory::Interceptor>
protocol_handler_interceptor) const OVERRIDE;
virtual ChromeURLRequestContext*
AcquireIsolatedMediaRequestContext(
ChromeURLRequestContext* app_context,
- const std::string& app_id) const OVERRIDE;
+ const StoragePartitionDescriptor& partition_descriptor)
+ const OVERRIDE;
virtual chrome_browser_net::LoadTimeStats* GetLoadTimeStats(
IOThread::Globals* io_thread_globals) const OVERRIDE;

Powered by Google App Engine
This is Rietveld 408576698