mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Move management of browser context to BrowserContext

Browse source
This commit is contained in:
Cheng Zhao 2015-09-05 20:52:50 +08:00
parent dc1e50c62e
commit 1a8dc77951
3 changed files with 49 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

34
brightray/browser/browser_context.h
View file

@ -5,6 +5,8 @@
#ifndef BRIGHTRAY_BROWSER_BROWSER_CONTEXT_H_
#define BRIGHTRAY_BROWSER_BROWSER_CONTEXT_H_
#include <map>
#include "browser/permission_manager.h"
#include "browser/url_request_context_getter.h"
@ -22,10 +24,11 @@ class BrowserContext : public base::RefCounted<BrowserContext>,
public content::BrowserContext,
public brightray::URLRequestContextGetter::Delegate {
public:
BrowserContext();
~BrowserContext();
// Get or Create the BrowserContext according to its |partition| and |in_memory|.
static BrowserContext* From(const std::string& partition, bool in_memory);
void Initialize(const std::string& partition, bool in_memory = false);
// Create a new BrowserContext, embedders should implement it on their own.
static BrowserContext* Create(const std::string& partition, bool in_memory);
// content::BrowserContext:
scoped_ptr<content::ZoomLevelDelegate> CreateZoomLevelDelegate(
@ -59,6 +62,9 @@ class BrowserContext : public base::RefCounted<BrowserContext>,
PrefService* prefs() { return prefs_.get(); }
protected:
BrowserContext(const std::string& partition, bool in_memory);
~BrowserContext() override;
// Subclasses should override this to register custom preferences.
virtual void RegisterPrefs(PrefRegistrySimple* pref_registry) {}
@ -73,6 +79,28 @@ class BrowserContext : public base::RefCounted<BrowserContext>,
void RegisterInternalPrefs(PrefRegistrySimple* pref_registry);
// partition_id => browser_context
struct PartitionKey {
std::string partition;
bool in_memory;
PartitionKey(const std::string& partition, bool in_memory)
: partition(partition), in_memory(in_memory) {}
bool operator<(const PartitionKey& other) const {
if (partition != other.partition)
return in_memory < other.in_memory;
return partition < other.partition;
}
bool operator==(const PartitionKey& other) const {
return (partition == other.partition) && (in_memory == other.in_memory);
}
};
using BrowserContextMap =
std::map<PartitionKey, scoped_refptr<brightray::BrowserContext>>;
static BrowserContextMap browser_context_map_;
base::FilePath path_;
bool in_memory_;
scoped_ptr<ResourceContext> resource_context_;