diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-20 00:46:58 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-20 00:46:58 +0000 |
| commit | 8e42eea41e438894c27d6a3db1e589fab99da53c (patch) | |
| tree | 3a9d4856297afab9fc9000916563ffa13732a242 /chrome/browser/ui/views/tabs | |
| parent | 6237cfdb32010d74af31329743e68ce29085450a (diff) | |
| download | chromium_src-8e42eea41e438894c27d6a3db1e589fab99da53c.zip chromium_src-8e42eea41e438894c27d6a3db1e589fab99da53c.tar.gz chromium_src-8e42eea41e438894c27d6a3db1e589fab99da53c.tar.bz2 | |
Changes the tabstrip so that when in touch mode and the tabs are not
stacked a short press and drag reorders rather than changing the set
of visible tabs.
BUG=161634
TEST=see comment 2 in bug.
R=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/12886030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@189180 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/views/tabs')
| -rw-r--r-- | chrome/browser/ui/views/tabs/tab_strip.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc index 6e76a3d..7660eed 100644 --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc @@ -1084,7 +1084,7 @@ void TabStrip::MaybeStartDrag( // . Real mouse event and control is down. This is mostly for testing. DCHECK(event.type() == ui::ET_MOUSE_PRESSED || event.type() == ui::ET_GESTURE_BEGIN); - if (adjust_layout_ && + if (touch_layout_.get() && ((event.type() == ui::ET_MOUSE_PRESSED && (((event.flags() & ui::EF_FROM_TOUCH) && static_cast<const ui::MouseEvent&>(event).IsLeftMouseButton()) || |