Renames browser/gtk/bookmark_context_menu to...

chrome/browser/gtk/bookmark_manager_gtk.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/gtk/bookmark_manager_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <vector>
 
 #include "app/gtk_dnd_util.h"
@@ skipping 582 matching lines @@
 
 void BookmarkManagerGtk::ResetOrganizeMenu(bool left) {
   organize_is_for_left_ = left;
   const BookmarkNode* parent = GetFolder();
   std::vector<const BookmarkNode*> nodes;
   if (!left)
     nodes = GetRightSelection();
   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() {
   GtkTreeIter select_iter;
   bookmark_utils::AddToTreeStore(model_,
       model_->GetBookmarkBarNode()->id(), left_store_, &select_iter);
   gtk_tree_selection_select_iter(left_selection(), &select_iter);
 
   // TODO(estade): is there a decent stock icon we can use here?
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
@@ skipping 607 matching lines @@
 
   return FALSE;
 }
 
 // static
 gboolean BookmarkManagerGtk::OnTreeViewButtonPress(
     GtkWidget* tree_view, GdkEventButton* button, BookmarkManagerGtk* bm) {
   if (button->button != 3)
     return FALSE;
 
-#if defined(TOOLKIT_GTK)
   if (bm->ignore_rightclicks_)
     return FALSE;
 
   // If the cursor is not hovering over a selected row, let it propagate
   // to the default handler so that a selection change may occur.
   if (!CursorIsOverSelection(GTK_TREE_VIEW(tree_view))) {
     bm->ignore_rightclicks_ = true;
     gtk_propagate_event(tree_view, reinterpret_cast<GdkEvent*>(button));
     bm->ignore_rightclicks_ = false;
   }
 
   bm->organize_menu_->PopupAsContext(button->time);
   return TRUE;
-#else
-  // Implement on GTK+views.
-  NOTIMPLEMENTED();
-  return FALSE;
-#endif
 }
 
 // static
 gboolean BookmarkManagerGtk::OnTreeViewButtonRelease(
     GtkWidget* tree_view, GdkEventButton* button, BookmarkManagerGtk* bm) {
   if (bm->delaying_mousedown_ && (tree_view == bm->right_tree_view_))
     bm->SendDelayedMousedown();
 
   return FALSE;
 }
@@ skipping 25 matching lines @@
       default:
         break;
     }
   } else if (key->keyval == GDK_Delete) {
     command = IDS_BOOKMARK_BAR_REMOVE;
   }
 
   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;
 }
 
 // static
 void BookmarkManagerGtk::OnFolderNameEdited(GtkCellRendererText* render,
     gchar* path, gchar* new_folder_name, BookmarkManagerGtk* bm) {
   // A folder named was edited in place.  Sync the change to the bookmark
   // model.
   GtkTreeIter iter;
@@ skipping 115 matching lines @@
       modifier & gtk_accelerator_get_default_mod_mask());
   // The only accelerator we have registered is ctrl+w, so any other value is a
   // non-fatal error.
   DCHECK_EQ(keyval, static_cast<guint>(GDK_w));
   DCHECK_EQ(modifier, GDK_CONTROL_MASK);
 
   gtk_widget_destroy(bookmark_manager->window_);
 
   return TRUE;
 }