chrome/browser/ui/views/tab_contents/native_tab_contents_view_aura.cc - Issue 9384024: Prefer ScopedNestableTaskAllower over manual save/restore

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/tab_contents/native_tab_contents_view_aura.cc

Issue 9384024: Prefer ScopedNestableTaskAllower over manual save/restore (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rename back to "allow". Created 8 years, 10 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/simple_message_box_views.cc ('k') | chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/tab_contents/native_tab_contents_view_aura.cc

diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_aura.cc b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_aura.cc

index 795b9672025fc6e732cb8569ec8ba41209a52fd3..ab1a843353de93e1ba10d887708f4f71f27d5350 100644

--- a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_aura.cc

+++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_aura.cc

@@ -211,11 +211,12 @@ void NativeTabContentsViewAura::StartDragging(const WebDropData& drop_data,

// We need to enable recursive tasks on the message loop so we can get

// updates while in the system DoDragDrop loop.

- bool old_state = MessageLoop::current()->NestableTasksAllowed();

- MessageLoop::current()->SetNestableTasksAllowed(true);

- int result_op = aura::client::GetDragDropClient()->StartDragAndDrop(

- data, ConvertFromWeb(ops));

- MessageLoop::current()->SetNestableTasksAllowed(old_state);

+ int result_op = 0;

+ {

+ MessageLoop::ScopedNestableTaskAllower allow(MessageLoop::current());

+ result_op = aura::client::GetDragDropClient()->StartDragAndDrop(

+ data, ConvertFromWeb(ops));

+ }

EndDrag(ConvertToWeb(result_op));

GetWebContents()->GetRenderViewHost()->DragSourceSystemDragEnded();