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

Unified Diff: chrome/browser/gtk/bookmark_manager_gtk.cc

Issue 155026: Fix the current remaining Views-GTK compile and linker errors. (Closed)
Patch Set: New patch Created 11 years, 6 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/browser_theme_provider.cc ('k') | chrome/browser/views/dialog_stubs_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/gtk/bookmark_manager_gtk.cc
diff --git a/chrome/browser/gtk/bookmark_manager_gtk.cc b/chrome/browser/gtk/bookmark_manager_gtk.cc
index 08c9faba5392c8804718a62ede7a6de5c9b1b892..197797d35304f7840bb87349ff63aaf1670b3b5a 100644
--- a/chrome/browser/gtk/bookmark_manager_gtk.cc
+++ b/chrome/browser/gtk/bookmark_manager_gtk.cc
@@ -517,7 +517,12 @@ void BookmarkManagerGtk::ResetOrganizeMenu(bool left) {
organize_menu_.reset(new BookmarkContextMenu(window_, profile_, NULL, NULL,
parent, nodes, BookmarkContextMenu::BOOKMARK_MANAGER_ORGANIZE_MENU));
+#if defined(TOOLKIT_GTK)
gtk_menu_item_set_submenu(GTK_MENU_ITEM(organize_), organize_menu_->menu());
+#else
+ // GTK+Views should implement this somehow.
+ NOTIMPLEMENTED();
+#endif
}
void BookmarkManagerGtk::BuildLeftStore() {
@@ -1111,8 +1116,13 @@ gboolean BookmarkManagerGtk::OnRightTreeViewMotion(GtkWidget* tree_view,
// static
gboolean BookmarkManagerGtk::OnTreeViewButtonRelease(GtkWidget* tree_view,
GdkEventButton* button, BookmarkManagerGtk* bm) {
+#if defined(TOOLKIT_GTK)
if (button->button == 3)
bm->organize_menu_->PopupAsContext(button->time);
+#else
+ // Implement on GTK+views.
+ NOTIMPLEMENTED();
+#endif
if (bm->delaying_mousedown_ && (tree_view == bm->right_tree_view_)) {
gtk_propagate_event(tree_view,
« no previous file with comments | « chrome/browser/browser_theme_provider.cc ('k') | chrome/browser/views/dialog_stubs_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698