content/browser/web_contents/web_contents_view_aura.h - Issue 10966023: Fix the crash that could occur when the window is closed while web contents drag is in progress.

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: content/browser/web_contents/web_contents_view_aura.h

Issue 10966023: Fix the crash that could occur when the window is closed while web contents drag is in progress. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 3 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

« content/browser/web_contents/web_contents_drag_win.cc ('K') | « content/browser/web_contents/web_contents_view_android.cc ('k') | content/browser/web_contents/web_contents_view_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/web_contents/web_contents_view_aura.h

diff --git a/content/browser/web_contents/web_contents_view_aura.h b/content/browser/web_contents/web_contents_view_aura.h

index 1da23ffec5fc5bd27f4b30cd71bd8a6cbf1a6882..9e9c99a9b17ca0e7aaf9749e8688b3d9da211c0d 100644

--- a/content/browser/web_contents/web_contents_view_aura.h

+++ b/content/browser/web_contents/web_contents_view_aura.h

@@ -63,8 +63,6 @@ class CONTENT_EXPORT WebContentsViewAura

virtual void SetInitialFocus() OVERRIDE;

virtual void StoreFocus() OVERRIDE;

virtual void RestoreFocus() OVERRIDE;

- virtual bool IsDoingDrag() const OVERRIDE;

- virtual void CancelDragAndCloseTab() OVERRIDE;

virtual WebDropData* GetDropData() const OVERRIDE;

virtual bool IsEventTracking() const OVERRIDE;

virtual void CloseTabAfterEventTracking() OVERRIDE;

@@ -136,10 +134,6 @@ class CONTENT_EXPORT WebContentsViewAura

WebKit::WebDragOperationsMask current_drag_op_;

- // Set to true if we want to close the tab after the system drag operation

- // has finished.

- bool close_tab_after_drag_ends_;

content::WebDragDestDelegate* drag_dest_delegate_;

// We keep track of the render view host we're dragging over. If it changes