diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-27 15:02:37 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-27 15:02:37 +0000 |
| commit | cb673f6b01e192151801a318ecb9c8f80c3e61c3 (patch) | |
| tree | 08f7cd4da57c1af4347e36d34d6523d1d0d294f2 /views | |
| parent | 0446db079ba108e034d7b79da20c694b6eee935b (diff) | |
| download | chromium_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 'views')
| -rw-r--r-- | views/widget/native_widget_gtk.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/views/widget/native_widget_gtk.cc b/views/widget/native_widget_gtk.cc index d9cd0dd..1fcf0af 100644 --- a/views/widget/native_widget_gtk.cc +++ b/views/widget/native_widget_gtk.cc @@ -1331,9 +1331,7 @@ void NativeWidgetGtk::SchedulePaintInRect(const gfx::Rect& rect) { void NativeWidgetGtk::SetCursor(gfx::NativeCursor cursor) { #if defined(TOUCH_UI) - if (ui::TouchFactory::GetInstance()->keep_mouse_cursor()) - cursor = gfx::GetCursor(GDK_ARROW); - else if (!ui::TouchFactory::GetInstance()->is_cursor_visible()) + if (!ui::TouchFactory::GetInstance()->is_cursor_visible()) cursor = gfx::GetCursor(GDK_BLANK_CURSOR); #endif // |window_contents_| is placed on top of |widget_|. So the cursor needs to be |