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

Unified Diff: chrome/browser/views/tabs/dragged_tab_controller.cc

Issue 16246: CRASH at Tab::OnMouseReleased... (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 11 years, 11 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 | « chrome/browser/views/tabs/dragged_tab_controller.h ('k') | chrome/browser/views/tabs/tab.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/views/tabs/dragged_tab_controller.cc
===================================================================
--- chrome/browser/views/tabs/dragged_tab_controller.cc (revision 7580)
+++ chrome/browser/views/tabs/dragged_tab_controller.cc (working copy)
@@ -355,8 +355,8 @@
}
}
-void DraggedTabController::EndDrag(bool canceled) {
- EndDragImpl(canceled ? CANCELED : NORMAL);
+bool DraggedTabController::EndDrag(bool canceled) {
+ return EndDragImpl(canceled ? CANCELED : NORMAL);
}
Tab* DraggedTabController::GetDragSourceTabForContents(
@@ -921,7 +921,7 @@
return index == TabStripModel::kNoTab ? NULL : tabstrip->GetTabAt(index);
}
-void DraggedTabController::EndDragImpl(EndDragType type) {
+bool DraggedTabController::EndDragImpl(EndDragType type) {
bring_to_front_timer_.Stop();
// Hide the current dock controllers.
@@ -959,6 +959,8 @@
// If we're not destroyed now, we'll be destroyed asynchronously later.
if (destroy_now)
source_tabstrip_->DestroyDragController();
+
+ return destroy_now;
}
void DraggedTabController::RevertDrag() {
« no previous file with comments | « chrome/browser/views/tabs/dragged_tab_controller.h ('k') | chrome/browser/views/tabs/tab.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698