Commit 956d5aec authored by mdm@chromium.org's avatar mdm@chromium.org

Linux: avoid a NOTREACHED() by not reaching it.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/195046

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25832 0039d316-1c4b-4281-b951-d872f2087c98
parent 3c0c1556
...@@ -298,7 +298,8 @@ void BookmarkBarGtk::BookmarkNodeMoved(BookmarkModel* model, ...@@ -298,7 +298,8 @@ void BookmarkBarGtk::BookmarkNodeMoved(BookmarkModel* model,
int old_index, int old_index,
const BookmarkNode* new_parent, const BookmarkNode* new_parent,
int new_index) { int new_index) {
BookmarkNodeRemoved(model, old_parent, old_index, NULL); const BookmarkNode* node = new_parent->GetChild(new_index);
BookmarkNodeRemoved(model, old_parent, old_index, node);
BookmarkNodeAdded(model, new_parent, new_index); BookmarkNodeAdded(model, new_parent, new_index);
} }
...@@ -334,6 +335,7 @@ void BookmarkBarGtk::BookmarkNodeRemoved(BookmarkModel* model, ...@@ -334,6 +335,7 @@ void BookmarkBarGtk::BookmarkNodeRemoved(BookmarkModel* model,
GtkWidget* to_remove = GTK_WIDGET(gtk_toolbar_get_nth_item( GtkWidget* to_remove = GTK_WIDGET(gtk_toolbar_get_nth_item(
GTK_TOOLBAR(bookmark_toolbar_.get()), old_index)); GTK_TOOLBAR(bookmark_toolbar_.get()), old_index));
if (node->is_folder())
menu_bar_helper_.Remove(gtk_bin_get_child(GTK_BIN(to_remove))); menu_bar_helper_.Remove(gtk_bin_get_child(GTK_BIN(to_remove)));
gtk_container_remove(GTK_CONTAINER(bookmark_toolbar_.get()), gtk_container_remove(GTK_CONTAINER(bookmark_toolbar_.get()),
to_remove); to_remove);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment