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

Unified Diff: chrome/browser/views/bookmark_bar_view.cc

Issue 440: Attempt at fixing crash. I believe this is happening during session... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 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
« no previous file with comments | « chrome/browser/views/bookmark_bar_view.h ('k') | chrome/browser/vista_frame.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/views/bookmark_bar_view.cc
===================================================================
--- chrome/browser/views/bookmark_bar_view.cc (revision 1736)
+++ chrome/browser/views/bookmark_bar_view.cc (working copy)
@@ -1118,7 +1118,6 @@
SetContextMenuController(this);
size_animation_.reset(new SlideAnimation(this));
- size_animation_->SetSlideDuration(4000);
}
MenuButton* BookmarkBarView::CreateOtherBookmarkedButton() {
@@ -1166,6 +1165,17 @@
SchedulePaint();
}
+void BookmarkBarView::BookmarkModelBeingDeleted(BookmarkBarModel* model) {
+ // The bookmark model should never be deleted before us. This code exists
+ // to check for regressions in shutdown code and not crash.
+ NOTREACHED();
+
+ // Do minimal cleanup, presumably we'll be deleted shortly.
+ NotifyModelChanged();
+ model_->RemoveObserver(this);
+ model_ = NULL;
+}
+
void BookmarkBarView::BookmarkNodeMoved(BookmarkBarModel* model,
BookmarkBarNode* old_parent,
int old_index,
« no previous file with comments | « chrome/browser/views/bookmark_bar_view.h ('k') | chrome/browser/vista_frame.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698