diff options
author | dmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-18 00:40:17 +0000 |
---|---|---|
committer | dmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-18 00:40:17 +0000 |
commit | 30c918084bac874b6cfaabb93f0bb2545c5354e2 (patch) | |
tree | 45bd81ec93407433426c0a6d1421bc189a96c2c4 /base/file_version_info.h | |
parent | d9cb161850584e5d277b141aadb68abec0af28bb (diff) | |
download | chromium_src-30c918084bac874b6cfaabb93f0bb2545c5354e2.zip chromium_src-30c918084bac874b6cfaabb93f0bb2545c5354e2.tar.gz chromium_src-30c918084bac874b6cfaabb93f0bb2545c5354e2.tar.bz2 |
Revert 69592 - file_version_info was not finding Mac values correctly.
Changed file_version_info to find Mac values, and changed version_info to fail if values can't be found.
BUG=NONE
TEST=BUILD
Review URL: http://codereview.chromium.org/5815001
TBR=dmaclach@chromium.org
Review URL: http://codereview.chromium.org/6017003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69601 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/file_version_info.h')
-rw-r--r-- | base/file_version_info.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/base/file_version_info.h b/base/file_version_info.h index 41a97fa..19407d2 100644 --- a/base/file_version_info.h +++ b/base/file_version_info.h @@ -24,13 +24,10 @@ class FileVersionInfo { // goes wrong (typically the file does not exit or cannot be opened). The // returned object should be deleted when you are done with it. static FileVersionInfo* CreateFileVersionInfo(const FilePath& file_path); -#endif // OS_WIN || OS_MACOSX - -#if defined(OS_WIN) // This version, taking a wstring, is deprecated and only kept around // until we can fix all callers. static FileVersionInfo* CreateFileVersionInfo(const std::wstring& file_path); -#endif // OS_WIN +#endif // Creates a FileVersionInfo for the current module. Returns NULL in case // of error. The returned object should be deleted when you are done with it. |