Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3081)

Unified Diff: chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc

Issue 298653007: Revert of Remove override of View::HitTestRect() from BookmarkBarView (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/bookmarks/bookmark_bar_view.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
index 4ca84e883a68cf4296537784b4064e5998dfacb1..fda8b77ab11f0a40ffc4c2459e1c69fedf37d210 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
@@ -679,6 +679,19 @@
return prefsize;
}
+bool BookmarkBarView::HitTestRect(const gfx::Rect& rect) const {
+ // If bookmark bar is attached and omnibox popup is open (on top of the bar),
+ // force hit-testing to fail. This prevents hovers/clicks just above the
+ // omnibox popup from activating the top few pixels of items on the bookmark
+ // bar.
+ if (!IsDetached() && browser_view_ &&
+ browser_view_->GetLocationBar()->GetOmniboxView()->model()->
+ popup_model()->IsOpen()) {
+ return false;
+ }
+ return DetachableToolbarView::HitTestRect(rect);
+}
+
gfx::Size BookmarkBarView::GetMinimumSize() const {
// The minimum width of the bookmark bar should at least contain the overflow
// button, by which one can access all the Bookmark Bar items, and the "Other
@@ -915,20 +928,6 @@
const char* BookmarkBarView::GetClassName() const {
return kViewClassName;
-}
-
-bool BookmarkBarView::CanAcceptEvent(const ui::Event& event) {
- // If bookmark bar is attached and omnibox popup is open (on top of the bar),
- // do not allow the bookmark bar to accept events. This prevents, for example,
- // hovers/clicks just above the omnibox popup from activating the top few
- // pixels of items on the bookmark bar.
- if (!IsDetached() && browser_view_ &&
- browser_view_->GetLocationBar()->GetOmniboxView()->model()->
- popup_model()->IsOpen()) {
- return false;
- }
-
- return View::CanAcceptEvent(event);
}
void BookmarkBarView::GetAccessibleState(ui::AXViewState* state) {
« no previous file with comments | « chrome/browser/ui/views/bookmarks/bookmark_bar_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698