summaryrefslogtreecommitdiffstats
path: root/views/controls/menu/menu_controller.h
diff options
context:
space:
mode:
authormsw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-29 00:39:05 +0000
committermsw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-29 00:39:05 +0000
commit34338254f776be94d79ca184c4eb2ea5b3f62318 (patch)
treea20d913935cfe06590e6a39808234774e35e3ff8 /views/controls/menu/menu_controller.h
parent7bd801611073a0e79a011a96ec72cb201656344a (diff)
downloadchromium_src-34338254f776be94d79ca184c4eb2ea5b3f62318.zip
chromium_src-34338254f776be94d79ca184c4eb2ea5b3f62318.tar.gz
chromium_src-34338254f776be94d79ca184c4eb2ea5b3f62318.tar.bz2
Disambiguate OnMouseCaptureLost from OnMouseReleased.
Nix RenderWidgetHostViewViews' OnMouseCaptureLost forwarding. Consolidate code, remove unnecessary overrides, etc. Fix up test, |event| args, OVERRIDEs, and (c) dates. BUG=72040 TEST=Views mouse button release, cancelling mouse down/drag. Review URL: http://codereview.chromium.org/6685069 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79640 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/menu/menu_controller.h')
-rw-r--r--views/controls/menu/menu_controller.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/views/controls/menu/menu_controller.h b/views/controls/menu/menu_controller.h
index 8458a30..177a460 100644
--- a/views/controls/menu/menu_controller.h
+++ b/views/controls/menu/menu_controller.h
@@ -394,11 +394,11 @@ class MenuController : public MessageLoopForUI::Dispatcher {
// Sends a mouse release event to the current |active_mouse_view_| and sets
// it to null.
void SendMouseReleaseToActiveView(SubmenuView* event_source,
- const MouseEvent& event,
- bool cancel);
+ const MouseEvent& event);
- // Variant of above that sends a cancel mouse release.
- void SendMouseReleaseToActiveView();
+ // Sends a mouse capture lost event to the current |active_mouse_view_| and
+ // sets it to null.
+ void SendMouseCaptureLostToActiveView();
// The active instance.
static MenuController* active_instance_;