diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-21 23:20:18 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-21 23:20:18 +0000 |
| commit | ed04d9617d5f244efae81b237df7db41bc142cca (patch) | |
| tree | ae76f5071fce9e2d3d60086b670f82e6c30cecb4 /chrome/browser/gtk/bookmark_bar_gtk.cc | |
| parent | a97f2b462ac8062e59849bfa2323d90f461fd5ff (diff) | |
| download | chromium_src-ed04d9617d5f244efae81b237df7db41bc142cca.zip chromium_src-ed04d9617d5f244efae81b237df7db41bc142cca.tar.gz chromium_src-ed04d9617d5f244efae81b237df7db41bc142cca.tar.bz2 | |
Merge BookmarkContextMenuGtk back into BookmarkContextMenu.
Review URL: http://codereview.chromium.org/87038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14155 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/bookmark_bar_gtk.cc')
| -rw-r--r-- | chrome/browser/gtk/bookmark_bar_gtk.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/gtk/bookmark_bar_gtk.cc b/chrome/browser/gtk/bookmark_bar_gtk.cc index 7819ad4..0c8346e 100644 --- a/chrome/browser/gtk/bookmark_bar_gtk.cc +++ b/chrome/browser/gtk/bookmark_bar_gtk.cc @@ -5,9 +5,9 @@ #include "chrome/browser/gtk/bookmark_bar_gtk.h" #include "base/gfx/gtk_util.h" +#include "chrome/browser/bookmarks/bookmark_context_menu.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/browser.h" -#include "chrome/browser/gtk/bookmark_context_menu_gtk.h" #include "chrome/browser/gtk/custom_button.h" #include "chrome/browser/gtk/gtk_chrome_button.h" #include "chrome/browser/metrics/user_metrics.h" @@ -398,11 +398,11 @@ void BookmarkBarGtk::PopupMenuForNode(GtkWidget* sender, BookmarkNode* node, nodes.push_back(parent); } - current_context_menu_.reset(new BookmarkContextMenuGtk( + current_context_menu_.reset(new BookmarkContextMenu( GTK_WINDOW(gtk_widget_get_toplevel(sender)), profile_, browser_, page_navigator_, parent, nodes, - BookmarkContextMenuGtk::BOOKMARK_BAR)); + BookmarkContextMenu::BOOKMARK_BAR)); current_context_menu_->PopupAsContext(event->time); } |