From 0577e911b387b0453c83b21f411e91b8e0df3f5e Mon Sep 17 00:00:00 2001 From: Eran Tiktin Date: Fri, 4 Sep 2015 23:24:42 +0300 Subject: [PATCH] Fix build failing on Windows build.py would fail on Windows due to a couple of changes made in #2459. This commit fixes those issues. --- atom/browser/atom_browser_main_parts.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/atom/browser/atom_browser_main_parts.cc b/atom/browser/atom_browser_main_parts.cc index 4463115cfee5..806c12b7eace 100644 --- a/atom/browser/atom_browser_main_parts.cc +++ b/atom/browser/atom_browser_main_parts.cc @@ -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 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); }