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

Get us compiling on Win32

Browse source
This commit is contained in:
Paul Betts 2017-01-23 14:49:18 -08:00 • committed by deepak1556
parent 2b64452d9c
commit 8580a34f9f
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/ui/webui/pdf_viewer_handler.h
View file

@ -16,7 +16,7 @@ class ListValue;
} }
namespace content { namespace content {
class StreamInfo; struct StreamInfo;
} }
namespace atom { namespace atom {

5
atom/browser/ui/webui/pdf_viewer_ui.cc
View file

@ -49,7 +49,8 @@ class BundledDataSource : public content::URLDataSource {
const GotDataCallback& callback) override { const GotDataCallback& callback) override {
std::string filename = PathWithoutParams(path); std::string filename = PathWithoutParams(path);
std::map<base::FilePath, int>::const_iterator entry = std::map<base::FilePath, int>::const_iterator entry =
path_to_resource_id_.find(base::FilePath(filename)); path_to_resource_id_.find(base::FilePath::FromUTF8Unsafe(filename));
if (entry != path_to_resource_id_.end()) { if (entry != path_to_resource_id_.end()) {
int resource_id = entry->second; int resource_id = entry->second;
const ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); const ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
@ -60,7 +61,7 @@ class BundledDataSource : public content::URLDataSource {
std::string GetMimeType(const std::string& path) const override { std::string GetMimeType(const std::string& path) const override {
std::string filename = PathWithoutParams(path); std::string filename = PathWithoutParams(path);
std::string mime_type; std::string mime_type;
net::GetMimeTypeFromFile(base::FilePath(filename), &mime_type); net::GetMimeTypeFromFile(base::FilePath::FromUTF8Unsafe(filename), &mime_type);
return mime_type; return mime_type;
} }

2
atom/browser/ui/webui/pdf_viewer_ui.h
View file

@ -14,7 +14,7 @@
namespace content { namespace content {
class BrowserContext; class BrowserContext;
class StreamInfo; struct StreamInfo;
} }
namespace atom { namespace atom {