diff options
| author | skuhne@chromium.org <skuhne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-14 21:19:24 +0000 |
|---|---|---|
| committer | skuhne@chromium.org <skuhne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-14 21:19:24 +0000 |
| commit | 74a02d77f8dcd01aeaf4f55d59ed7281cc307e56 (patch) | |
| tree | 9ad64166020a8e87118e12f3567c077b140ee0c7 /ui/base | |
| parent | aea54a175c420bb4da44e675ea82e86b4958e64f (diff) | |
| download | chromium_src-74a02d77f8dcd01aeaf4f55d59ed7281cc307e56.zip chromium_src-74a02d77f8dcd01aeaf4f55d59ed7281cc307e56.tar.gz chromium_src-74a02d77f8dcd01aeaf4f55d59ed7281cc307e56.tar.bz2 | |
Changing default for calibration from enable to disable
BUG=127616
TEST=None
Review URL: https://chromiumcodereview.appspot.com/10332133
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136983 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base')
| -rw-r--r-- | ui/base/ui_base_switches.cc | 6 | ||||
| -rw-r--r-- | ui/base/ui_base_switches.h | 2 | ||||
| -rw-r--r-- | ui/base/x/events_x.cc | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/ui/base/ui_base_switches.cc b/ui/base/ui_base_switches.cc index 93601f4..3a03a27 100644 --- a/ui/base/ui_base_switches.cc +++ b/ui/base/ui_base_switches.cc @@ -10,13 +10,13 @@ namespace switches { // the contents in the absence of a viewport meta tag. const char kDefaultDeviceScaleFactor[] = "default-device-scale-factor"; -// Enable touch screen calibration. -const char kDisableTouchCalibration[] = "disable-touch-calibration"; - // Let text glyphs have X-positions that aren't snapped to the pixel grid. const char kEnableTextSubpixelPositioning[] = "enable-text-subpixel-positioning"; +// Enable touch screen calibration. +const char kEnableTouchCalibration[] = "enable-touch-calibration"; + // Enable support for touch events. const char kEnableTouchEvents[] = "enable-touch-events"; diff --git a/ui/base/ui_base_switches.h b/ui/base/ui_base_switches.h index 3d4bda8..0c10b1e 100644 --- a/ui/base/ui_base_switches.h +++ b/ui/base/ui_base_switches.h @@ -14,8 +14,8 @@ namespace switches { UI_EXPORT extern const char kDefaultDeviceScaleFactor[]; -UI_EXPORT extern const char kDisableTouchCalibration[]; UI_EXPORT extern const char kEnableTextSubpixelPositioning[]; +UI_EXPORT extern const char kEnableTouchCalibration[]; UI_EXPORT extern const char kEnableTouchEvents[]; UI_EXPORT extern const char kLang[]; UI_EXPORT extern const char kLocalePak[]; diff --git a/ui/base/x/events_x.cc b/ui/base/x/events_x.cc index 6c57af0..b390d42 100644 --- a/ui/base/x/events_x.cc +++ b/ui/base/x/events_x.cc @@ -505,8 +505,8 @@ gfx::Point CalibrateTouchCoordinates( const XIDeviceEvent* xievent) { int x = static_cast<int>(xievent->event_x); int y = static_cast<int>(xievent->event_y); - if (CommandLine::ForCurrentProcess()->HasSwitch( - switches::kDisableTouchCalibration)) + if (!CommandLine::ForCurrentProcess()->HasSwitch( + switches::kEnableTouchCalibration)) return gfx::Point(x, y); // TODO(skuhne): Find a new home for these hardware dependent touch // constants. |