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

Only store weak ref to BrowserContext

Browse source
This commit is contained in:
Cheng Zhao 2015-09-05 22:34:42 +08:00
parent 1a8dc77951
commit d2ea3b496d
4 changed files with 26 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

11
brightray/browser/browser_context.h
View file

@ -11,6 +11,7 @@
#include "browser/url_request_context_getter.h"
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
#include "content/public/browser/browser_context.h"
class PrefRegistrySimple;
@ -25,10 +26,12 @@ class BrowserContext : public base::RefCounted<BrowserContext>,
public brightray::URLRequestContextGetter::Delegate {
public:
// Get or Create the BrowserContext according to its |partition| and |in_memory|.
static BrowserContext* From(const std::string& partition, bool in_memory);
static scoped_refptr<BrowserContext> From(
const std::string& partition, bool in_memory);
// Create a new BrowserContext, embedders should implement it on their own.
static BrowserContext* Create(const std::string& partition, bool in_memory);
static scoped_refptr<BrowserContext> Create(
const std::string& partition, bool in_memory);
// content::BrowserContext:
scoped_ptr<content::ZoomLevelDelegate> CreateZoomLevelDelegate(
@ -98,7 +101,7 @@ class BrowserContext : public base::RefCounted<BrowserContext>,
}
};
using BrowserContextMap =
std::map<PartitionKey, scoped_refptr<brightray::BrowserContext>>;
std::map<PartitionKey, base::WeakPtr<brightray::BrowserContext>>;
static BrowserContextMap browser_context_map_;
base::FilePath path_;
@ -108,6 +111,8 @@ class BrowserContext : public base::RefCounted<BrowserContext>,
scoped_ptr<PrefService> prefs_;
scoped_ptr<PermissionManager> permission_manager_;
base::WeakPtrFactory<BrowserContext> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(BrowserContext);
};