| Index: base/file_version_info.h
|
| diff --git a/base/file_version_info.h b/base/file_version_info.h
|
| index 57b837c24b08e90c8a1b14ec4175160a7cea0d3e..84d665ef0d566bb1dec02e33984131279bf7e709 100644
|
| --- a/base/file_version_info.h
|
| +++ b/base/file_version_info.h
|
| @@ -7,12 +7,6 @@
|
|
|
| #include "build/build_config.h"
|
|
|
| -#if defined(OS_WIN)
|
| -#include <windows.h>
|
| -// http://blogs.msdn.com/oldnewthing/archive/2004/10/25/247180.aspx
|
| -extern "C" IMAGE_DOS_HEADER __ImageBase;
|
| -#endif // OS_WIN
|
| -
|
| #include <string>
|
|
|
| #include "base/base_export.h"
|
| @@ -35,33 +29,17 @@ class FilePath;
|
| class BASE_EXPORT FileVersionInfo {
|
| public:
|
| virtual ~FileVersionInfo() {}
|
| -#if defined(OS_WIN) || defined(OS_MACOSX)
|
| +#if defined(OS_MACOSX)
|
| // Creates a FileVersionInfo for the specified path. Returns NULL if something
|
| // 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 base::FilePath& file_path);
|
| -#endif // OS_WIN || OS_MACOSX
|
| -
|
| -#if defined(OS_WIN)
|
| - // Creates a FileVersionInfo for the specified module. Returns NULL in case
|
| - // of error. The returned object should be deleted when you are done with it.
|
| - static FileVersionInfo* CreateFileVersionInfoForModule(HMODULE module);
|
| +#endif // OS_MACOSX
|
|
|
| // 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.
|
| - // This function should be inlined so that the "current module" is evaluated
|
| - // correctly, instead of being the module that contains base.
|
| - __forceinline static FileVersionInfo*
|
| - CreateFileVersionInfoForCurrentModule() {
|
| - HMODULE module = reinterpret_cast<HMODULE>(&__ImageBase);
|
| - return CreateFileVersionInfoForModule(module);
|
| - }
|
| -#else
|
| - // 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.
|
| static FileVersionInfo* CreateFileVersionInfoForCurrentModule();
|
| -#endif // OS_WIN
|
|
|
| // Accessors to the different version properties.
|
| // Returns an empty string if the property is not found.
|
|
|