- Windows: Delay destroying the browser window until pending drag operations have completed (issue #610).

- Revert: Windows: Reset the window procedure in the WebWidgetHost destructor to avoid crashes if messages are delivered after the window is destroyed.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@655 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2012-05-30 18:05:23 +00:00
parent 584bd26331
commit 5c2e5eab8d
6 changed files with 22 additions and 5 deletions

View File

@@ -254,7 +254,9 @@ class BrowserWebViewDelegate : public WebKit::WebViewClient,
BrowserDragDelegate* drag_delegate() { return drag_delegate_.get(); }
WebDropTarget* drop_target() { return drop_target_.get(); }
#endif
void set_destroy_on_drag_end(bool val) { destroy_on_drag_end_ = val; }
#endif // defined(OS_WIN)
void set_pending_extra_data(BrowserExtraData* extra_data) {
pending_extra_data_.reset(extra_data);
@@ -358,6 +360,7 @@ class BrowserWebViewDelegate : public WebKit::WebViewClient,
#if defined(OS_WIN)
// Classes needed by drag and drop.
scoped_refptr<BrowserDragDelegate> drag_delegate_;
bool destroy_on_drag_end_;
#endif
#if defined(OS_WIN) || defined(OS_LINUX)
scoped_refptr<WebDropTarget> drop_target_;