Renames browser/gtk/bookmark_context_menu to

BoookmarkContextMenuGtk. I need to do this so that views/gtk can use
both BookmarkContextMenu and BookmarkContextMenuGtk.

BUG=none
TEST=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28400 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 18 deletions

diff --git a/chrome/browser/gtk/bookmark_manager_gtk.cc b/chrome/browser/gtk/bookmark_manager_gtk.cc
index 0e54ccd..6277690 100644
--- a/chrome/browser/gtk/bookmark_manager_gtk.cc
+++ b/chrome/browser/gtk/bookmark_manager_gtk.cc
@@ -600,21 +600,16 @@ void BookmarkManagerGtk::ResetOrganizeMenu(bool left) {
   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 @@ gboolean BookmarkManagerGtk::OnTreeViewButtonPress(
   if (button->button != 3)
     return FALSE;
 
-#if defined(TOOLKIT_GTK)
   if (bm->ignore_rightclicks_)
     return FALSE;
 
@@ -1256,11 +1250,6 @@ gboolean BookmarkManagerGtk::OnTreeViewButtonPress(
 
   bm->organize_menu_->PopupAsContext(button->time);
   return TRUE;
-#else
-  // Implement on GTK+views.
-  NOTIMPLEMENTED();
-  return FALSE;
-#endif
 }
 
 // static
@@ -1306,15 +1295,11 @@ gboolean BookmarkManagerGtk::OnTreeViewKeyPress(
   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;
 }