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

Unified Diff: chrome/browser/tab_contents/tab_contents.cc

Issue 149466: Fix a crash that happens if a tab is closed while (Closed)
Patch Set: add comment to member var Created 11 years, 5 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 | « base/base_drag_source.cc ('k') | chrome/browser/tab_contents/tab_contents_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/tab_contents/tab_contents.cc
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
index 9832fa4e4ee2a04416310b7dafe004620ac67a19..bcbb09b652e0ea1151b62262de07ba7c9e429ff0 100644
--- a/chrome/browser/tab_contents/tab_contents.cc
+++ b/chrome/browser/tab_contents/tab_contents.cc
@@ -1904,6 +1904,13 @@ void TabContents::UpdateInspectorSettings(const std::wstring& raw_settings) {
}
void TabContents::Close(RenderViewHost* rvh) {
+ // If we close the tab while we're in the middle of a drag, we'll crash.
+ // Instead, cancel the drag and close it as soon as the drag ends.
+ if (view()->IsDoingDrag()) {
+ view()->CancelDragAndCloseTab();
+ return;
+ }
+
// Ignore this if it comes from a RenderViewHost that we aren't showing.
if (delegate() && rvh == render_view_host())
delegate()->CloseContents(this);
« no previous file with comments | « base/base_drag_source.cc ('k') | chrome/browser/tab_contents/tab_contents_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698