chrome/browser/ui/views/tabs/tab_strip.cc - Issue 143153004: [Reland] Fix crash when accidentally touching the screen during a multi window resize

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/tabs/tab_strip.cc

Issue 143153004: [Reland] Fix crash when accidentally touching the screen during a multi window resize (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc ('k') | ui/views/widget/native_widget_aura_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/tabs/tab_strip.cc

diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc

index f37295b7ec75b5f5bfb30996d8eeb83c9fccd47d..0183c57893d9c0ed70590659cd7b96c36dc42dfd 100644

--- a/chrome/browser/ui/views/tabs/tab_strip.cc

+++ b/chrome/browser/ui/views/tabs/tab_strip.cc

@@ -1148,16 +1148,11 @@ void TabStrip::MaybeStartDrag(

move_behavior = TabDragController::MOVE_VISIBILE_TABS;

}

- views::Widget* widget = GetWidget();

#if defined(OS_WIN)

// It doesn't make sense to drag tabs out on Win8's single window Metro mode.

if (win8::IsSingleWindowMetroMode())

detach_behavior = TabDragController::NOT_DETACHABLE;

#endif

- // Gestures don't automatically do a capture. We don't allow multiple drags at

- // the same time, so we explicitly capture.

- if (event.type() == ui::ET_GESTURE_BEGIN)

- widget->SetCapture(this);

drag_controller_.reset(new TabDragController);

drag_controller_->Init(

this, tab, tabs, gfx::Point(x, y), event.x(), selection_model,