Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(806)

Unified Diff: base/win/windows_version.cc

Issue 7918035: Disables code for making sure window to attach to is visible on (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Version change from Carlos Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/win/windows_version.h ('k') | chrome/browser/ui/tabs/dock_info_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/win/windows_version.cc
diff --git a/base/win/windows_version.cc b/base/win/windows_version.cc
index 5779074ddf6f329338592f91964399ee7d35a2fe..3b280ce7023dfc59ccac1795b553af2038142109 100644
--- a/base/win/windows_version.cc
+++ b/base/win/windows_version.cc
@@ -39,12 +39,23 @@ OSInfo::OSInfo()
if ((version_number_.major == 5) && (version_number_.minor > 0)) {
version_ = (version_number_.minor == 1) ? VERSION_XP : VERSION_SERVER_2003;
} else if (version_number_.major == 6) {
- if (version_info.wProductType == VER_NT_WORKSTATION)
- version_ = (version_number_.minor == 0) ? VERSION_VISTA : VERSION_WIN7;
- else
+ if (version_info.wProductType == VER_NT_WORKSTATION) {
+ switch (version_number_.minor) {
+ case 0:
+ version_ = VERSION_VISTA;
+ break;
+ case 1:
+ version_ = VERSION_WIN7;
+ break;
+ default: // case 2 appears to be win8.
+ version_ = VERSION_WIN8;
+ }
+ } else {
version_ = VERSION_SERVER_2008;
+ }
} else if (version_number_.major > 6) {
- version_ = VERSION_WIN7;
+ NOTREACHED();
+ version_ = VERSION_WIN_LAST;
}
service_pack_.major = version_info.wServicePackMajor;
service_pack_.minor = version_info.wServicePackMinor;
« no previous file with comments | « base/win/windows_version.h ('k') | chrome/browser/ui/tabs/dock_info_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698