github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-25 23:38:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

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
parent 619c77f409 0577e911b3
commit 81d423c547
1 changed files with 3 additions and 2 deletions
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 {
const base::FilePath::CharType kStoragePartitionDirname[] = "Partitions";
const base::FilePath::CharType kStoragePartitionDirname[] =
FILE_PATH_LITERAL("Partitions");
void GetStoragePartitionConfig(const GURL& partition,
base::FilePath* partition_path,
@@ -77,7 +78,7 @@ content::BrowserContext* AtomBrowserMainParts::GetBrowserContextForPartition(
return browser_context_map_.get(id);
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());
return browser_context_map_.get(id);
}