| Index: chrome/browser/gtk/bookmark_manager_gtk.cc
|
| ===================================================================
|
| --- chrome/browser/gtk/bookmark_manager_gtk.cc (revision 28297)
|
| +++ chrome/browser/gtk/bookmark_manager_gtk.cc (working copy)
|
| @@ -600,21 +600,16 @@
|
| else if (parent)
|
| nodes.push_back(parent);
|
|
|
| -#if defined(TOOLKIT_GTK)
|
| // We DeleteSoon on the old one to give any reference holders (e.g.
|
| // the event that caused this reset) a chance to release their refs.
|
| - BookmarkContextMenu* old_menu = organize_menu_.release();
|
| + BookmarkContextMenuGtk* old_menu = organize_menu_.release();
|
| if (old_menu)
|
| MessageLoop::current()->DeleteSoon(FROM_HERE, old_menu);
|
|
|
| - organize_menu_.reset(new BookmarkContextMenu(window_, profile_, NULL, NULL,
|
| - parent, nodes, BookmarkContextMenu::BOOKMARK_MANAGER_ORGANIZE_MENU,
|
| + organize_menu_.reset(new BookmarkContextMenuGtk(window_, profile_, NULL, NULL,
|
| + parent, nodes, BookmarkContextMenuGtk::BOOKMARK_MANAGER_ORGANIZE_MENU,
|
| NULL));
|
| gtk_menu_item_set_submenu(GTK_MENU_ITEM(organize_), organize_menu_->menu());
|
| -#else
|
| - // GTK+Views should implement this somehow.
|
| - NOTIMPLEMENTED();
|
| -#endif
|
| }
|
|
|
| void BookmarkManagerGtk::BuildLeftStore() {
|
| @@ -1242,7 +1237,6 @@
|
| if (button->button != 3)
|
| return FALSE;
|
|
|
| -#if defined(TOOLKIT_GTK)
|
| if (bm->ignore_rightclicks_)
|
| return FALSE;
|
|
|
| @@ -1256,11 +1250,6 @@
|
|
|
| bm->organize_menu_->PopupAsContext(button->time);
|
| return TRUE;
|
| -#else
|
| - // Implement on GTK+views.
|
| - NOTIMPLEMENTED();
|
| - return FALSE;
|
| -#endif
|
| }
|
|
|
| // static
|
| @@ -1306,15 +1295,11 @@
|
| if (command == -1)
|
| return FALSE;
|
|
|
| -#if defined(TOOLKIT_GTK)
|
| if (bm->organize_menu_.get() &&
|
| bm->organize_menu_->IsCommandEnabled(command)) {
|
| bm->organize_menu_->ExecuteCommand(command);
|
| return TRUE;
|
| }
|
| -#else
|
| - NOTIMPLEMENTED();
|
| -#endif
|
|
|
| return FALSE;
|
| }
|
|
|