Remove override of View::HitTestRect() from BookmarkBarView

chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
 
 #include <algorithm>
 #include <limits>
 #include <set>
 #include <vector>
@@ skipping 650 matching lines @@
   // detached states.
   return detached_overlap + static_cast<int>(
       (attached_overlap - detached_overlap) *
           size_animation_->GetCurrentValue());
 }
 
 gfx::Size BookmarkBarView::GetPreferredSize() {
   return LayoutItems(true);
 }
 
-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() {
   // 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
   // Bookmarks" folder, along with appropriate margins and button padding.
   int width = kLeftMargin;
 
   int height = chrome::kBookmarkBarHeight;
   if (IsDetached()) {
     double current_state = 1 - size_animation_->GetCurrentValue();
     width += 2 * static_cast<int>(kNewtabHorizontalPadding * current_state);
@@ skipping 218 matching lines @@
 }
 
 void BookmarkBarView::OnThemeChanged() {
   UpdateColors();
 }
 
 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 true;

[sadrul, 2014/05/21 15:46:04]

return View::CanAcceptEvent(event)?

[tdanderson, 2014/05/21 21:11:25]

Done.

+}
+
 void BookmarkBarView::GetAccessibleState(ui::AXViewState* state) {
   state->role = ui::AX_ROLE_TOOLBAR;
   state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_BOOKMARKS);
 }
 
 void BookmarkBarView::AnimationProgressed(const gfx::Animation* animation) {
   // |browser_view_| can be NULL during tests.
   if (browser_view_)
     browser_view_->ToolbarSizeChanged(true);
 }
@@ skipping 922 matching lines @@
   DCHECK(apps_page_shortcut_);
   // Only perform layout if required.
   bool visible = chrome::ShouldShowAppsShortcutInBookmarkBar(
       browser_->profile(), browser_->host_desktop_type());
   if (apps_page_shortcut_->visible() == visible)
     return;
   apps_page_shortcut_->SetVisible(visible);
   UpdateBookmarksSeparatorVisibility();
   Layout();
 }