diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-20 03:33:49 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-20 03:33:49 +0000 |
| commit | 14c997648baae85582322f33f6f58d3acbbd4865 (patch) | |
| tree | 10200fa254aeeb1a969105fede9fd617ec8f70e8 /base | |
| parent | 79fff8227ab720a8bf309107ef96f57ae93592c1 (diff) | |
| download | chromium_src-14c997648baae85582322f33f6f58d3acbbd4865.zip chromium_src-14c997648baae85582322f33f6f58d3acbbd4865.tar.gz chromium_src-14c997648baae85582322f33f6f58d3acbbd4865.tar.bz2 | |
Disables code for making sure window to attach to is visible on
win8. This is temporary until I find a better way to go about this.
BUG=96646
TEST=make sure you can attach tabs on win8.
R=brettw@chromium.org,cpu@chromium.org,ben@chromium.org
Review URL: http://codereview.chromium.org/7918035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101912 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/win/windows_version.cc | 19 | ||||
| -rw-r--r-- | base/win/windows_version.h | 2 |
2 files changed, 17 insertions, 4 deletions
diff --git a/base/win/windows_version.cc b/base/win/windows_version.cc index 5779074..3b280ce 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; diff --git a/base/win/windows_version.h b/base/win/windows_version.h index 920438b..1061b47 100644 --- a/base/win/windows_version.h +++ b/base/win/windows_version.h @@ -25,6 +25,8 @@ enum Version { VERSION_VISTA, VERSION_SERVER_2008, VERSION_WIN7, + VERSION_WIN8, + VERSION_WIN_LAST, // Indicates error condition. }; // A singleton that can be used to query various pieces of information about the |