From 1bcf001748ed3d6e5d305587f069ac2ae02aae5a Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Thu, 19 Sep 2013 21:13:32 +0000 Subject: Work on GN Windows build. Visual Studio had some problems with template type deduction so I added some more explicit parameters. There were also a few misc cases of string conversions that needed updating. I updated the buildfiles so we only bring in libusb, for example, on Linux (this was already happening, but it was additionally being pulled in everywhere at the top level). I also tweaked some NSS-related file lists. BUG= R=scottmg@chromium.org Review URL: https://codereview.chromium.org/24290002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224202 0039d316-1c4b-4281-b951-d872f2087c98 --- tools/gn/filesystem_utils.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'tools/gn/filesystem_utils.h') diff --git a/tools/gn/filesystem_utils.h b/tools/gn/filesystem_utils.h index 90e9d50..bf214dc 100644 --- a/tools/gn/filesystem_utils.h +++ b/tools/gn/filesystem_utils.h @@ -40,7 +40,10 @@ SourceFileType GetSourceFileType(const SourceFile& file, const char* GetExtensionForOutputType(Target::OutputType type, Settings::TargetOS os); -std::string FilePathToUTF8(const base::FilePath& path); +std::string FilePathToUTF8(const base::FilePath::StringType& str); +inline std::string FilePathToUTF8(const base::FilePath& path) { + return FilePathToUTF8(path.value()); +} base::FilePath UTF8ToFilePath(const base::StringPiece& sp); // Extensions ----------------------------------------------------------------- -- cgit v1.1