diff options
author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-11 04:21:22 +0000 |
---|---|---|
committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-11 04:21:22 +0000 |
commit | 58e302f7b9ec818727b8fef19fedf668e62e979c (patch) | |
tree | 27a9dbdf37c44d991a1af10783238f87b8c780c1 | |
parent | bf2b800fa98b601c09e52e61f36360e8ade6c5e2 (diff) | |
download | chromium_src-58e302f7b9ec818727b8fef19fedf668e62e979c.zip chromium_src-58e302f7b9ec818727b8fef19fedf668e62e979c.tar.gz chromium_src-58e302f7b9ec818727b8fef19fedf668e62e979c.tar.bz2 |
Fixes regression where bookmark bar context menu wouldn't show when
clicking on the bookmark bar. The regression is the result of
introducing AccessibleToolbarView as a superclass of BookmarkBarView
and having it override ShowContextMenu.
BUG=none
TEST=right click on an empty spot of the bookmark bar and make sure
you get a context menu.
Review URL: http://codereview.chromium.org/544001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35901 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/browser/views/bookmark_bar_view.cc | 4 | ||||
-rw-r--r-- | chrome/browser/views/bookmark_bar_view.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc index 67936a7..4ca2148 100644 --- a/chrome/browser/views/bookmark_bar_view.cc +++ b/chrome/browser/views/bookmark_bar_view.cc @@ -715,6 +715,10 @@ int BookmarkBarView::OnPerformDrop(const DropTargetEvent& event) { index); } +void BookmarkBarView::ShowContextMenu(int x, int y, bool is_mouse_gesture) { + ShowContextMenu(this, x, y, is_mouse_gesture); +} + bool BookmarkBarView::IsAccessibleViewTraversable(views::View* view) { return view != bookmarks_separator_view_ && view != instructions_; } diff --git a/chrome/browser/views/bookmark_bar_view.h b/chrome/browser/views/bookmark_bar_view.h index 797ec51..c4df926 100644 --- a/chrome/browser/views/bookmark_bar_view.h +++ b/chrome/browser/views/bookmark_bar_view.h @@ -112,6 +112,7 @@ class BookmarkBarView : public DetachableToolbarView, virtual int OnDragUpdated(const views::DropTargetEvent& event); virtual void OnDragExited(); virtual int OnPerformDrop(const views::DropTargetEvent& event); + virtual void ShowContextMenu(int x, int y, bool is_mouse_gesture); // AccessibleToolbarView methods: virtual bool IsAccessibleViewTraversable(views::View* view); |