Skip to content

Commit

Permalink
Fix #4727: update menu views code with views framework
Browse files Browse the repository at this point in the history
See d369bb310eb5062da44877dcdefd7120c57f9bbb in chromium repo for
UI Views framework update.
  • Loading branch information
rogerwang committed Apr 15, 2016
1 parent 3b5a129 commit e440953
Showing 1 changed file with 0 additions and 14 deletions.
14 changes: 0 additions & 14 deletions src/browser/menubar_view.cc
Original file line number Diff line number Diff line change
Expand Up @@ -46,20 +46,6 @@ class MenuBarButton : public views::MenuButton {
return !tooltip->empty();
}

bool IsTriggerableEvent(const ui::Event& e) override {
// Left clicks and taps should show the menu contents and right clicks
// should show the context menu. They should not trigger the opening of
// underlying urls.
if (e.type() == ui::ET_GESTURE_TAP ||
(e.IsMouseEvent() && (e.flags() &
(ui::EF_LEFT_MOUSE_BUTTON | ui::EF_RIGHT_MOUSE_BUTTON))))
return false;

if (e.IsMouseEvent())
return ui::DispositionFromEventFlags(e.flags()) != CURRENT_TAB;
return false;
}

private:

DISALLOW_COPY_AND_ASSIGN(MenuBarButton);
Expand Down

0 comments on commit e440953

Please sign in to comment.