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

Side by Side Diff: ui/views/controls/menu/menu_delegate.cc

Issue 10546104: Make IsTriggerableEvent take Event objects and use it to verify whether tap events should trigger. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Pass Event to ShouldEnterPushedState. Created 8 years, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/views/controls/menu/menu_delegate.h ('k') | ui/views/controls/menu/menu_model_adapter.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/views/controls/menu/menu_config.h" 5 #include "ui/views/controls/menu/menu_config.h"
6 #include "ui/views/controls/menu/menu_delegate.h" 6 #include "ui/views/controls/menu/menu_delegate.h"
7 7
8 namespace views { 8 namespace views {
9 9
10 MenuDelegate::~MenuDelegate() {} 10 MenuDelegate::~MenuDelegate() {}
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 51
52 bool MenuDelegate::ShouldCloseAllMenusOnExecute(int id) { 52 bool MenuDelegate::ShouldCloseAllMenusOnExecute(int id) {
53 return true; 53 return true;
54 } 54 }
55 55
56 void MenuDelegate::ExecuteCommand(int id, int mouse_event_flags) { 56 void MenuDelegate::ExecuteCommand(int id, int mouse_event_flags) {
57 ExecuteCommand(id); 57 ExecuteCommand(id);
58 } 58 }
59 59
60 bool MenuDelegate::IsTriggerableEvent(MenuItemView* source, 60 bool MenuDelegate::IsTriggerableEvent(MenuItemView* source,
61 const MouseEvent& e) { 61 const Event& e) {
62 return e.IsLeftMouseButton() || e.IsRightMouseButton(); 62 return e.type() == ui::ET_GESTURE_TAP ||
63 e.type() == ui::ET_GESTURE_TAP_DOWN ||
64 (e.IsMouseEvent() && (e.flags() &
65 (ui::EF_LEFT_MOUSE_BUTTON | ui::EF_RIGHT_MOUSE_BUTTON)));
63 } 66 }
64 67
65 bool MenuDelegate::CanDrop(MenuItemView* menu, const OSExchangeData& data) { 68 bool MenuDelegate::CanDrop(MenuItemView* menu, const OSExchangeData& data) {
66 return false; 69 return false;
67 } 70 }
68 71
69 bool MenuDelegate::GetDropFormats( 72 bool MenuDelegate::GetDropFormats(
70 MenuItemView* menu, 73 MenuItemView* menu,
71 int* formats, 74 int* formats,
72 std::set<OSExchangeData::CustomFormat>* custom_formats) { 75 std::set<OSExchangeData::CustomFormat>* custom_formats) {
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 return 800; 121 return 800;
119 } 122 }
120 123
121 void MenuDelegate::WillShowMenu(MenuItemView* menu) { 124 void MenuDelegate::WillShowMenu(MenuItemView* menu) {
122 } 125 }
123 126
124 void MenuDelegate::WillHideMenu(MenuItemView* menu) { 127 void MenuDelegate::WillHideMenu(MenuItemView* menu) {
125 } 128 }
126 129
127 } // namespace views 130 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/controls/menu/menu_delegate.h ('k') | ui/views/controls/menu/menu_model_adapter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698