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

Merge pull request #2710 from etiktin/fix_build_failing_on_windows

Browse source 
Fix build failing on windows
This commit is contained in:
Cheng Zhao 2015-09-06 10:52:30 +08:00
commit 81d423c547
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
atom/browser/atom_browser_main_parts.cc
View file

@ -28,7 +28,8 @@ namespace atom {
namespace { namespace {
const base::FilePath::CharType kStoragePartitionDirname[] = "Partitions"; const base::FilePath::CharType kStoragePartitionDirname[] =
FILE_PATH_LITERAL("Partitions");
void GetStoragePartitionConfig(const GURL& partition, void GetStoragePartitionConfig(const GURL& partition,
base::FilePath* partition_path, base::FilePath* partition_path,
@ -77,7 +78,7 @@ content::BrowserContext* AtomBrowserMainParts::GetBrowserContextForPartition(
return browser_context_map_.get(id); return browser_context_map_.get(id);
scoped_ptr<brightray::BrowserContext> browser_context(CreateBrowserContext()); scoped_ptr<brightray::BrowserContext> browser_context(CreateBrowserContext());
browser_context->Initialize(partition_path.value(), in_memory); browser_context->Initialize(partition_path.AsUTF8Unsafe(), in_memory);
browser_context_map_.set(id, browser_context.Pass()); browser_context_map_.set(id, browser_context.Pass());
return browser_context_map_.get(id); return browser_context_map_.get(id);
} }