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

Merge branch 'master' of https://github.com/MaxWhere/brightray

Browse source
This commit is contained in:
Heilig Benedek 2016-08-01 13:16:57 +02:00
commit bc5fff148e
2 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
brightray/brightray.gyp
View file

@ -24,6 +24,7 @@
'.',
'..',
'<(libchromiumcontent_src_dir)',
'<(libchromiumcontent_src_dir)/gpu',
'<(libchromiumcontent_src_dir)/skia/config',
'<(libchromiumcontent_src_dir)/third_party/skia/include/core',
'<(libchromiumcontent_src_dir)/third_party/skia/include/config',

1
brightray/browser/browser_context.cc
View file

@ -109,7 +109,6 @@ BrowserContext::BrowserContext(const std::string& partition, bool in_memory)
path_ = path_.Append(FILE_PATH_LITERAL("Partitions"))
.Append(base::FilePath::FromUTF8Unsafe(MakePartitionName(partition)));
InitPrefs();
content::BrowserContext::Initialize(this, path_);
browser_context_map_[PartitionKey(partition, in_memory)] = GetWeakPtr();