Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(205)

Unified Diff: content/browser/web_contents/web_contents_view_win.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: Patch to land 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
Index: content/browser/web_contents/web_contents_view_win.h
diff --git a/content/browser/web_contents/web_contents_view_win.h b/content/browser/web_contents/web_contents_view_win.h
index decaabb1187363f02f3bb0b7dd41a47e52947af4..9d7b8ff1703bb15ceca1401298229552338aea0c 100644
--- a/content/browser/web_contents/web_contents_view_win.h
+++ b/content/browser/web_contents/web_contents_view_win.h
@@ -71,8 +71,6 @@ class CONTENT_EXPORT WebContentsViewWin
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;
@@ -140,13 +138,6 @@ class CONTENT_EXPORT WebContentsViewWin
// Used to handle the drag-and-drop.
scoped_refptr<WebContentsDragWin> drag_handler_;
- // Set to true if we want to close the tab after the system drag operation
- // has finished.
- bool close_tab_after_drag_ends_;
-
- // Used to close the tab after the stack has unwound.
- base::OneShotTimer<WebContentsViewWin> close_tab_timer_;
-
scoped_ptr<ui::HWNDMessageFilter> hwnd_message_filter_;
DISALLOW_COPY_AND_ASSIGN(WebContentsViewWin);

Powered by Google App Engine
This is Rietveld 408576698