summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-27 15:02:37 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-27 15:02:37 +0000
commitcb673f6b01e192151801a318ecb9c8f80c3e61c3 (patch)
tree08f7cd4da57c1af4347e36d34d6523d1d0d294f2 /ui
parent0446db079ba108e034d7b79da20c694b6eee935b (diff)
downloadchromium_src-cb673f6b01e192151801a318ecb9c8f80c3e61c3.zip
chromium_src-cb673f6b01e192151801a318ecb9c8f80c3e61c3.tar.gz
chromium_src-cb673f6b01e192151801a318ecb9c8f80c3e61c3.tar.bz2
touchui: Update a couple of command-line flags.
This removes the --keep-mouse-cursor flag, and moves the --touch-devices flag from touchui-only to linux-views (i.e. chromeos, aura on linux, touchui). BUG=none TEST=none Review URL: http://codereview.chromium.org/8371022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107570 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r--ui/base/touch/touch_factory.cc1
-rw-r--r--ui/base/touch/touch_factory.h7
2 files changed, 0 insertions, 8 deletions
diff --git a/ui/base/touch/touch_factory.cc b/ui/base/touch/touch_factory.cc
index b3f9e51..f4bfb1e 100644
--- a/ui/base/touch/touch_factory.cc
+++ b/ui/base/touch/touch_factory.cc
@@ -132,7 +132,6 @@ TouchFactory* TouchFactory::GetInstance() {
TouchFactory::TouchFactory()
: is_cursor_visible_(true),
- keep_mouse_cursor_(false),
cursor_timer_(),
pointer_device_lookup_(),
touch_device_available_(false),
diff --git a/ui/base/touch/touch_factory.h b/ui/base/touch/touch_factory.h
index 158d2e0..f4be821 100644
--- a/ui/base/touch/touch_factory.h
+++ b/ui/base/touch/touch_factory.h
@@ -134,9 +134,6 @@ class UI_EXPORT TouchFactory {
float* min,
float* max);
- void set_keep_mouse_cursor(bool keep) { keep_mouse_cursor_ = keep; }
- bool keep_mouse_cursor() const { return keep_mouse_cursor_; }
-
private:
TouchFactory();
@@ -158,10 +155,6 @@ class UI_EXPORT TouchFactory {
// is immediately displayed.
bool is_cursor_visible_;
- // Whether to turn off automatic hiding of mouse cursor. This is useful for
- // debugging touch build on the desktop.
- bool keep_mouse_cursor_;
-
// The cursor is hidden if it is idle for a certain amount time. This timer
// is used to keep track of the idleness.
base::OneShotTimer<TouchFactory> cursor_timer_;