Revert 66190 - gtk: Add context menu to Bookmark Editor....

chrome/browser/gtk/bookmark_editor_gtk.h

 // Copyright (c) 2010 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.
 
 #ifndef CHROME_BROWSER_GTK_BOOKMARK_EDITOR_GTK_H_
 #define CHROME_BROWSER_GTK_BOOKMARK_EDITOR_GTK_H_
 #pragma once
 
 #include "app/gtk_integers.h"
 #include "app/gtk_signal.h"
 #include "base/gtest_prod_util.h"
-#include "base/scoped_ptr.h"
 #include "base/string16.h"
 #include "chrome/browser/bookmarks/bookmark_editor.h"
 #include "chrome/browser/bookmarks/bookmark_model_observer.h"
 
 class GURL;
 
 typedef union  _GdkEvent GdkEvent;
-typedef struct _GdkEventButton GdkEventButton;
 typedef struct _GtkTreeIter GtkTreeIter;
 typedef struct _GtkTreeSelection GtkTreeSelection;
 typedef struct _GtkTreeStore GtkTreeStore;
 typedef struct _GtkWidget GtkWidget;
 
 // GTK version of the bookmark editor dialog.
 class BookmarkEditorGtk : public BookmarkEditor,
                           public BookmarkModelObserver {
   FRIEND_TEST_ALL_PREFIXES(BookmarkEditorGtkTest, ChangeParent);
   FRIEND_TEST_ALL_PREFIXES(BookmarkEditorGtkTest, ChangeParentAndURL);
@@ skipping 11 matching lines @@
                     const BookmarkNode* parent,
                     const EditDetails& details,
                     BookmarkEditor::Configuration configuration);
 
   virtual ~BookmarkEditorGtk();
 
   void Show();
   void Close();
 
  private:
-  class ContextMenuController;
-  friend class ContextMenuController;
-
   void Init(GtkWindow* parent_window);
 
   // BookmarkModel observer methods. Any structural change results in
   // resetting the tree model.
   virtual void Loaded(BookmarkModel* model) { }
   virtual void BookmarkNodeMoved(BookmarkModel* model,
                                  const BookmarkNode* old_parent,
                                  int old_index,
                                  const BookmarkNode* new_parent,
                                  int new_index);
@@ skipping 37 matching lines @@
   CHROMEGTK_CALLBACK_0(BookmarkEditorGtk, void, OnSelectionChanged);
   CHROMEGTK_CALLBACK_1(BookmarkEditorGtk, void, OnResponse, int);
   CHROMEGTK_CALLBACK_1(BookmarkEditorGtk, gboolean, OnWindowDeleteEvent,
                        GdkEvent*);
 
   CHROMEGTK_CALLBACK_0(BookmarkEditorGtk, void, OnWindowDestroy);
   CHROMEGTK_CALLBACK_0(BookmarkEditorGtk, void, OnEntryChanged);
 
   CHROMEGTK_CALLBACK_0(BookmarkEditorGtk, void, OnNewFolderClicked);
 
-  CHROMEGTK_CALLBACK_1(BookmarkEditorGtk, gboolean, OnTreeViewButtonPressEvent,
-                       GdkEventButton*);
-
-  void ShowContextMenu();
-
-  void NewFolder();
-
   // Profile the entry is from.
   Profile* profile_;
 
   // The dialog to display on screen.
   GtkWidget* dialog_;
   GtkWidget* name_entry_;
   GtkWidget* url_entry_;  // This is NULL if IsEditingFolder.
   GtkWidget* tree_view_;
   GtkWidget* new_folder_button_;
 
@@ skipping 17 matching lines @@
   // Mode used to create nodes from.
   BookmarkModel* bb_model_;
 
   // If true, we're running the menu for the bookmark bar or other bookmarks
   // nodes.
   bool running_menu_for_root_;
 
   // Is the tree shown?
   bool show_tree_;
 
-  // The context menu controller.
-  scoped_ptr<ContextMenuController> menu_controller_;
-
   DISALLOW_COPY_AND_ASSIGN(BookmarkEditorGtk);
 };
 
 #endif  // CHROME_BROWSER_GTK_BOOKMARK_EDITOR_GTK_H_