chrome/browser/ui/views/tabs/tab_strip.cc - Issue 23698003: [temporary M30 fix] Disable dragging tabs with web contents modal dialogs displayed

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 23698003: [temporary M30 fix] Disable dragging tabs with web contents modal dialogs displayed (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix comment Created 7 years, 4 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/fake_base_tab_strip_controller.cc ('k') | chrome/browser/ui/views/tabs/tab_strip_controller.h » ('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 321fe2cd1497432896b352dc577f1964c72423d4..6841fd93fa618f6d749327c9241325a1900fb213 100644

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

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

@@ -1127,6 +1127,16 @@ void TabStrip::MaybeStartDrag(

gfx::Screen::GetScreenFor(widget->GetNativeView())->GetNumDisplays() == 1)

detach_behavior = TabDragController::NOT_DETACHABLE;

+#if defined(OS_CHROMEOS)

+ // TODO(wittman): This is a temporary workaround to avoid crbug.com/275274 and

+ // crbug.com/274856 in M30 and should be reverted after merge, as we have a

+ // solution to these bugs in trunk.

+ //

+ // Don't allow detaching if the tab has a WebContentsModalDialogView opened.

+ if (controller()->IsTabShowingWebViewModalDialog(GetModelIndexOfTab(tab)))

+ detach_behavior = TabDragController::NOT_DETACHABLE;

+#endif

#if defined(OS_WIN)

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

if (win8::IsSingleWindowMetroMode())