summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorgrt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-19 15:21:35 +0000
committergrt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-19 15:21:35 +0000
commit7b9f060ac59198fd6d2c242e3db3bf95c1d90db5 (patch)
tree46db83c2ab74234ad3ab8c0ab6e284af8e351560 /base
parent6628121d8e24ab6e2bac6db4c461a876d54c7d05 (diff)
downloadchromium_src-7b9f060ac59198fd6d2c242e3db3bf95c1d90db5.zip
chromium_src-7b9f060ac59198fd6d2c242e3db3bf95c1d90db5.tar.gz
chromium_src-7b9f060ac59198fd6d2c242e3db3bf95c1d90db5.tar.bz2
Handle portrait mode in is-a-tablet heuristic.
BUG=161229 TEST=see bug Review URL: https://chromiumcodereview.appspot.com/11413040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168528 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/win/win_util.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/base/win/win_util.cc b/base/win/win_util.cc
index 7c106a2..3b6b1761 100644
--- a/base/win/win_util.cc
+++ b/base/win/win_util.cc
@@ -196,7 +196,10 @@ bool IsMachineATablet() {
if ((sm & kMultiTouch) == kMultiTouch) {
int cx = GetSystemMetrics(SM_CXSCREEN);
int cy = GetSystemMetrics(SM_CYSCREEN);
- return cx <= kMaxTabletScreenWidth && cy <= kMaxTabletScreenHeight;
+ // Handle landscape and portrait modes.
+ return cx > cy ?
+ (cx <= kMaxTabletScreenWidth && cy <= kMaxTabletScreenHeight) :
+ (cy <= kMaxTabletScreenWidth && cx <= kMaxTabletScreenHeight);
}
return false;
}