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

Side by Side 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, 2 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_WIN_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_WIN_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_WIN_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_WIN_H_
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/timer.h" 10 #include "base/timer.h"
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 virtual void GetContainerBounds(gfx::Rect *out) const OVERRIDE; 64 virtual void GetContainerBounds(gfx::Rect *out) const OVERRIDE;
65 virtual void SetPageTitle(const string16& title) OVERRIDE; 65 virtual void SetPageTitle(const string16& title) OVERRIDE;
66 virtual void OnTabCrashed(base::TerminationStatus status, 66 virtual void OnTabCrashed(base::TerminationStatus status,
67 int error_code) OVERRIDE; 67 int error_code) OVERRIDE;
68 virtual void SizeContents(const gfx::Size& size) OVERRIDE; 68 virtual void SizeContents(const gfx::Size& size) OVERRIDE;
69 virtual void RenderViewCreated(content::RenderViewHost* host) OVERRIDE; 69 virtual void RenderViewCreated(content::RenderViewHost* host) OVERRIDE;
70 virtual void Focus() OVERRIDE; 70 virtual void Focus() OVERRIDE;
71 virtual void SetInitialFocus() OVERRIDE; 71 virtual void SetInitialFocus() OVERRIDE;
72 virtual void StoreFocus() OVERRIDE; 72 virtual void StoreFocus() OVERRIDE;
73 virtual void RestoreFocus() OVERRIDE; 73 virtual void RestoreFocus() OVERRIDE;
74 virtual bool IsDoingDrag() const OVERRIDE;
75 virtual void CancelDragAndCloseTab() OVERRIDE;
76 virtual WebDropData* GetDropData() const OVERRIDE; 74 virtual WebDropData* GetDropData() const OVERRIDE;
77 virtual bool IsEventTracking() const OVERRIDE; 75 virtual bool IsEventTracking() const OVERRIDE;
78 virtual void CloseTabAfterEventTracking() OVERRIDE; 76 virtual void CloseTabAfterEventTracking() OVERRIDE;
79 virtual gfx::Rect GetViewBounds() const OVERRIDE; 77 virtual gfx::Rect GetViewBounds() const OVERRIDE;
80 78
81 // Implementation of RenderViewHostDelegateView. 79 // Implementation of RenderViewHostDelegateView.
82 virtual void ShowContextMenu( 80 virtual void ShowContextMenu(
83 const content::ContextMenuParams& params, 81 const content::ContextMenuParams& params,
84 content::ContextMenuSourceType type) OVERRIDE; 82 content::ContextMenuSourceType type) OVERRIDE;
85 virtual void ShowPopupMenu(const gfx::Rect& bounds, 83 virtual void ShowPopupMenu(const gfx::Rect& bounds,
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 131
134 scoped_ptr<content::WebContentsViewDelegate> delegate_; 132 scoped_ptr<content::WebContentsViewDelegate> delegate_;
135 133
136 // The helper object that handles drag destination related interactions with 134 // The helper object that handles drag destination related interactions with
137 // Windows. 135 // Windows.
138 scoped_refptr<WebDragDest> drag_dest_; 136 scoped_refptr<WebDragDest> drag_dest_;
139 137
140 // Used to handle the drag-and-drop. 138 // Used to handle the drag-and-drop.
141 scoped_refptr<WebContentsDragWin> drag_handler_; 139 scoped_refptr<WebContentsDragWin> drag_handler_;
142 140
143 // Set to true if we want to close the tab after the system drag operation
144 // has finished.
145 bool close_tab_after_drag_ends_;
146
147 // Used to close the tab after the stack has unwound.
148 base::OneShotTimer<WebContentsViewWin> close_tab_timer_;
149
150 scoped_ptr<ui::HWNDMessageFilter> hwnd_message_filter_; 141 scoped_ptr<ui::HWNDMessageFilter> hwnd_message_filter_;
151 142
152 DISALLOW_COPY_AND_ASSIGN(WebContentsViewWin); 143 DISALLOW_COPY_AND_ASSIGN(WebContentsViewWin);
153 }; 144 };
154 145
155 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_WIN_H_ 146 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_WIN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698