diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-14 01:46:43 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-14 01:46:43 +0000 |
| commit | bcff05af3d60df10a21e07751a14b95ce9e7f3d4 (patch) | |
| tree | 76d8d3ec6c6c0d9564c675d423907e29607bf253 /chrome_frame | |
| parent | 474b2ab8c3b32c07692480aa234f3b2921fe5dd6 (diff) | |
| download | chromium_src-bcff05af3d60df10a21e07751a14b95ce9e7f3d4.zip chromium_src-bcff05af3d60df10a21e07751a14b95ce9e7f3d4.tar.gz chromium_src-bcff05af3d60df10a21e07751a14b95ce9e7f3d4.tar.bz2 | |
Refactor FileVersionInfo into an interface with platform implementations.
This allows us to move the chrome specific version informaton used by
Linux into src/chrome.
Add a GetChromeVersionInfo() for Linux in src/chrome/app/ and make sure to use this in src/chrome.
In src/webkit/glue, add a new glue method for getting the product version. When compiling chrome, use an implementation in src/chrome/renderer (which uses GetChromeVersionInfo()) and a stub implementation for test_shell.
Review URL: http://codereview.chromium.org/1560027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44435 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/chrome_frame.gyp | 1 | ||||
| -rw-r--r-- | chrome_frame/test/util_unittests.cc | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp index 9a53fe9..9d62c56 100644 --- a/chrome_frame/chrome_frame.gyp +++ b/chrome_frame/chrome_frame.gyp @@ -705,6 +705,7 @@ 'chrome_frame_utils', 'chrome_launcher', 'xulrunner_sdk', + '../chrome/chrome.gyp:chrome_version_info', '../chrome/chrome.gyp:common', '../chrome/chrome.gyp:utility', '../build/temp_gyp/googleurl.gyp:googleurl', diff --git a/chrome_frame/test/util_unittests.cc b/chrome_frame/test/util_unittests.cc index c589416..8780d3d 100644 --- a/chrome_frame/test/util_unittests.cc +++ b/chrome_frame/test/util_unittests.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/file_version_info.h" +#include "base/file_version_info_win.h" #include "chrome_frame/utils.h" #include "testing/gtest/include/gtest/gtest.h" @@ -27,7 +28,9 @@ TEST(UtilTests, GetModuleVersionTest) { EXPECT_NE(low, 0); // Make sure they give the same results. - VS_FIXEDFILEINFO* fixed_info = base_info->fixed_file_info(); + FileVersionInfoWin* base_info_win = + static_cast<FileVersionInfoWin*>(base_info.get()); + VS_FIXEDFILEINFO* fixed_info = base_info_win->fixed_file_info(); EXPECT_TRUE(fixed_info != NULL); EXPECT_EQ(fixed_info->dwFileVersionMS, static_cast<DWORD>(high)); |