summaryrefslogtreecommitdiffstats
path: root/base/file_version_info.cc
diff options
context:
space:
mode:
authoravi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-23 16:57:36 +0000
committeravi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-23 16:57:36 +0000
commit095622382c96432f4c90e69eb7591ebe9e5e3d46 (patch)
tree5ee1d78b950af33c3b544ae911d0d4b40786a458 /base/file_version_info.cc
parent40f52f0c52a82bc988bc95dc296ddfa89f09154a (diff)
downloadchromium_src-095622382c96432f4c90e69eb7591ebe9e5e3d46.zip
chromium_src-095622382c96432f4c90e69eb7591ebe9e5e3d46.tar.gz
chromium_src-095622382c96432f4c90e69eb7591ebe9e5e3d46.tar.bz2
Add FilePath support to FileVersionInfo, fix Mac memory issues.
Review URL: http://codereview.chromium.org/15082 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7417 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/file_version_info.cc')
-rw-r--r--base/file_version_info.cc10
1 files changed, 8 insertions, 2 deletions
diff --git a/base/file_version_info.cc b/base/file_version_info.cc
index 22d3d24..19aa011 100644
--- a/base/file_version_info.cc
+++ b/base/file_version_info.cc
@@ -40,9 +40,9 @@ FileVersionInfo* FileVersionInfo::CreateFileVersionInfoForCurrentModule() {
// static
FileVersionInfo* FileVersionInfo::CreateFileVersionInfo(
- const std::wstring& file_path) {
+ const FilePath& file_path) {
DWORD dummy;
- const wchar_t* path = file_path.c_str();
+ const wchar_t* path = file_path.value().c_str();
DWORD length = ::GetFileVersionInfoSize(path, &dummy);
if (length == 0)
return NULL;
@@ -71,6 +71,12 @@ FileVersionInfo* FileVersionInfo::CreateFileVersionInfo(
}
}
+FileVersionInfo* FileVersionInfo::CreateFileVersionInfo(
+ const std::wstring& file_path) {
+ FilePath file_path_fp = FilePath::FromWStringHack(file_path);
+ return CreateFileVersionInfo(file_path_fp);
+}
+
std::wstring FileVersionInfo::company_name() {
return GetStringValue(L"CompanyName");
}