diff options
| author | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-25 20:26:44 +0000 |
|---|---|---|
| committer | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-25 20:26:44 +0000 |
| commit | 309c8ff514d506364567d9e6095a295b8d5c3d3e (patch) | |
| tree | eed57b5e9e9b725c02d665472b839b305227f04a /base | |
| parent | 47041caea97f2ffe6ecd5963684d3b57f7dde14d (diff) | |
| download | chromium_src-309c8ff514d506364567d9e6095a295b8d5c3d3e.zip chromium_src-309c8ff514d506364567d9e6095a295b8d5c3d3e.tar.gz chromium_src-309c8ff514d506364567d9e6095a295b8d5c3d3e.tar.bz2 | |
Fix all places where we used the GetWinVersion function
incorrectly.
bug:7802
Review URL: http://codereview.chromium.org/28128
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10366 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/win_util.cc | 2 | ||||
| -rw-r--r-- | base/win_util_unittest.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/base/win_util.cc b/base/win_util.cc index c3bc69b..fe6d6f0 100644 --- a/base/win_util.cc +++ b/base/win_util.cc @@ -26,7 +26,7 @@ void GetNonClientMetrics(NONCLIENTMETRICS* metrics) { DCHECK(metrics); static const UINT SIZEOF_NONCLIENTMETRICS = - (GetWinVersion() == WINVERSION_VISTA) ? + (GetWinVersion() >= WINVERSION_VISTA) ? sizeof(NONCLIENTMETRICS) : NONCLIENTMETRICS_SIZE_PRE_VISTA; metrics->cbSize = SIZEOF_NONCLIENTMETRICS; const bool success = !!SystemParametersInfo(SPI_GETNONCLIENTMETRICS, diff --git a/base/win_util_unittest.cc b/base/win_util_unittest.cc index dddb6f0..8fd8c5c 100644 --- a/base/win_util_unittest.cc +++ b/base/win_util_unittest.cc @@ -47,7 +47,7 @@ class BaseWinUtilTest: public testing::Test { // The test is somewhat silly, because the Vista bots some have UAC enabled // and some have it disabled. At least we check that it does not crash. TEST_F(BaseWinUtilTest, TestIsUACEnabled) { - if (win_util::GetWinVersion() == win_util::WINVERSION_VISTA) { + if (win_util::GetWinVersion() >= win_util::WINVERSION_VISTA) { win_util::UserAccountControlIsEnabled(); } else { EXPECT_TRUE(win_util::UserAccountControlIsEnabled()); |