summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authordalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-07 17:12:07 +0000
committerdalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-07 17:12:07 +0000
commitc8e7ccc21c2f48414569fc122d5570be05bbf02c (patch)
tree89a7ac987430dc1ea8172b3d1c0b74e0d8918baa /base
parent5c28274b204ca4d675b59a6c0ffb37eb5664359e (diff)
downloadchromium_src-c8e7ccc21c2f48414569fc122d5570be05bbf02c.zip
chromium_src-c8e7ccc21c2f48414569fc122d5570be05bbf02c.tar.gz
chromium_src-c8e7ccc21c2f48414569fc122d5570be05bbf02c.tar.bz2
Revert 268825 "Add an UMA metric to track whether chrome is runn..."
> Add an UMA metric to track whether chrome is running on a tablet. > > BUG=353701 > R=cpu@chromium.org, isherman@chromium.org, thakis@chromium.org > > Review URL: https://codereview.chromium.org/262773015 TBR=zturner@chromium.org Review URL: https://codereview.chromium.org/271643004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@268836 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/base.gyp12
-rw-r--r--base/win/win_util.cc27
-rw-r--r--base/win/win_util.h5
3 files changed, 0 insertions, 44 deletions
diff --git a/base/base.gyp b/base/base.gyp
index 6127c4b..e8b7d30 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -183,18 +183,6 @@
],
},
}],
- ['OS == "win"', {
- 'msvs_settings': {
- 'VCLinkerTool': {
- 'DelayLoadDLLs': [
- 'powrprof.dll',
- ],
- 'AdditionalDependencies': [
- 'powrprof.lib',
- ],
- },
- },
- }],
['OS != "win" and OS != "ios"', {
'dependencies': ['../third_party/libevent/libevent.gyp:libevent'],
},],
diff --git a/base/win/win_util.cc b/base/win/win_util.cc
index 061b2a4..601dd7c 100644
--- a/base/win/win_util.cc
+++ b/base/win/win_util.cc
@@ -6,7 +6,6 @@
#include <aclapi.h>
#include <lm.h>
-#include <powrprof.h>
#include <shellapi.h>
#include <shlobj.h>
#include <shobjidl.h> // Must be before propkey.
@@ -233,32 +232,6 @@ bool IsTouchEnabledDevice() {
return false;
}
-bool IsTabletDevice() {
- if (GetSystemMetrics(SM_MAXIMUMTOUCHES) == 0)
- return false;
-
- base::win::Version version = base::win::GetVersion();
- if (version == base::win::VERSION_XP)
- return (GetSystemMetrics(SM_TABLETPC) != 0);
-
- // If the device is docked, the user is treating the device as a PC.
- if (GetSystemMetrics(SM_SYSTEMDOCKED) != 0)
- return false;
-
- // PlatformRoleSlate was only added in Windows 8, but prior to Win8 it is
- // still possible to check for a mobile power profile.
- POWER_PLATFORM_ROLE role = PowerDeterminePlatformRole();
- bool mobile_power_profile = (role == PlatformRoleMobile);
- bool slate_power_profile = false;
- if (version >= base::win::VERSION_WIN8)
- slate_power_profile = (role == PlatformRoleSlate);
-
- if (mobile_power_profile || slate_power_profile)
- return (GetSystemMetrics(SM_CONVERTIBLESLATEMODE) == 0);
-
- return false;
-}
-
bool DisplayVirtualKeyboard() {
if (base::win::GetVersion() < base::win::VERSION_WIN8)
return false;
diff --git a/base/win/win_util.h b/base/win/win_util.h
index 1c3f0f3..4a5c5cd 100644
--- a/base/win/win_util.h
+++ b/base/win/win_util.h
@@ -111,11 +111,6 @@ BASE_EXPORT void SetAbortBehaviorForCrashReporting();
// integrated multi-touch ready to use and has Windows version > Windows7.
BASE_EXPORT bool IsTouchEnabledDevice();
-// A tablet is a device that is touch enabled and also is being used
-// "like a tablet". This is used primarily for metrics in order to gain some
-// insight into how users use Chrome.
-BASE_EXPORT bool IsTabletDevice();
-
// Get the size of a struct up to and including the specified member.
// This is necessary to set compatible struct sizes for different versions
// of certain Windows APIs (e.g. SystemParametersInfo).