diff options
| author | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-08 21:29:05 +0000 |
|---|---|---|
| committer | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-08 21:29:05 +0000 |
| commit | f460cc8c601dc33138e32a94a2285ab9c587a7a0 (patch) | |
| tree | e968ce24a150bd32f405f90166227bab753d7abd /chrome/browser | |
| parent | 7045a47af50dce28324cf4a19eda30d91ef94695 (diff) | |
| download | chromium_src-f460cc8c601dc33138e32a94a2285ab9c587a7a0.zip chromium_src-f460cc8c601dc33138e32a94a2285ab9c587a7a0.tar.gz chromium_src-f460cc8c601dc33138e32a94a2285ab9c587a7a0.tar.bz2 | |
Reuse a method that will be required for criteria checker as well.
Review URL: http://codereview.chromium.org/6587
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3056 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/browser_main.cc | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index cb79033..1d8dda4 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -175,18 +175,13 @@ int DoUninstallTasks() { // functionality so we just ask the users if they want to uninstall Chrome. int HandleIconsCommands(const CommandLine &parsed_command_line) { if (parsed_command_line.HasSwitch(switches::kHideIcons)) { - OSVERSIONINFO version = {0}; - version.dwOSVersionInfoSize = sizeof(version); - if (!GetVersionEx(&version)) - return ResultCodes::UNSUPPORTED_PARAM; - std::wstring cp_applet; - if (version.dwMajorVersion >= 6) { + if (win_util::GetWinVersion() == win_util::WINVERSION_VISTA) { cp_applet.assign(L"Programs and Features"); // Windows Vista and later. - } else if (version.dwMajorVersion == 5 && version.dwMinorVersion >= 1) { + } else if (win_util::GetWinVersion() == win_util::WINVERSION_XP) { cp_applet.assign(L"Add/Remove Programs"); // Windows XP. } else { - return ResultCodes::UNSUPPORTED_PARAM; // Not supported on Win2K? + return ResultCodes::UNSUPPORTED_PARAM; // Not supported } const std::wstring msg = l10n_util::GetStringF(IDS_HIDE_ICONS_NOT_SUPPORTED, |