| 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,
|
|
|