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

Merge remote-tracking branch 'origin/master' into chrome52

Browse source
This commit is contained in:
Cheng Zhao 2016-07-21 05:34:20 -06:00
commit 4f3e9df055
16 changed files with 45 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

11
brightray/browser/browser_context.h
View file

@ -30,13 +30,14 @@ class BrowserContext : public base::RefCounted<BrowserContext>,
public content::BrowserContext,
public brightray::URLRequestContextGetter::Delegate {
public:
// Get or Create the BrowserContext according to its |partition| and |in_memory|.
static scoped_refptr<BrowserContext> From(
// Get the BrowserContext according to its |partition| and |in_memory|,
// empty pointer when be returned when there is no matching BrowserContext.
static scoped_refptr<BrowserContext> Get(
const std::string& partition, bool in_memory);
// Create a new BrowserContext, embedders should implement it on their own.
static scoped_refptr<BrowserContext> Create(
const std::string& partition, bool in_memory);
base::WeakPtr<BrowserContext> GetWeakPtr() {
return weak_factory_.GetWeakPtr();
}
// Get the request context, if there is no one, create it.
URLRequestContextGetter* GetRequestContext();