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

Side by Side Diff: ui/base/touch/touch_device_win.cc

Issue 11778042: Corrected logic in IsTouchDevicePresent to ignore pen devices. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 years, 11 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/base/touch/touch_device_win.h" 5 #include "ui/base/touch/touch_device_win.h"
6 #include "base/win/windows_version.h" 6 #include "base/win/windows_version.h"
7 #include <windows.h> 7 #include <windows.h>
8 8
9 namespace ui { 9 namespace ui {
10 10
11 bool IsTouchDevicePresent() { 11 bool IsTouchDevicePresent() {
12 // Docs: http://msdn.microsoft.com/en-us/library/dd371581(VS.85).aspx 12 int value = GetSystemMetrics(SM_DIGITIZER);
13 return (::base::win::GetVersion() >= ::base::win::VERSION_WIN7) && 13 return (value & (NID_READY | NID_INTEGRATED_TOUCH)) ==
14 (::GetSystemMetrics(SM_DIGITIZER) > 0); 14 (NID_READY | NID_INTEGRATED_TOUCH);
15 } 15 }
16 16
17 } // namespace ui 17 } // namespace ui
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698