diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-11 20:46:11 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-11 20:46:11 +0000 |
| commit | 759017e03abb02554ad06a1745290631c43d7751 (patch) | |
| tree | 72e1dba4bff28d67a55401c04e49f992bc857a46 /ash | |
| parent | d871f21cb2266670edc0ff636a2d65e4c30b55f7 (diff) | |
| download | chromium_src-759017e03abb02554ad06a1745290631c43d7751.zip chromium_src-759017e03abb02554ad06a1745290631c43d7751.tar.gz chromium_src-759017e03abb02554ad06a1745290631c43d7751.tar.bz2 | |
1) Invoke RootWindow::SetCapture(NULL) as a result from OS level mouse capture lost (eg from a popup)
2) Invoke OS level SetCapture, ReleaseCapture as a result of setting capture on root window
BUG=107875
TEST=
1) Make sure that bug 105993 does not repro
Review URL: https://chromiumcodereview.appspot.com/9228004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121655 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/tooltips/tooltip_controller.cc | 1 | ||||
| -rw-r--r-- | ash/wm/toplevel_window_event_filter.cc | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/ash/tooltips/tooltip_controller.cc b/ash/tooltips/tooltip_controller.cc index 48a4d9b..a999c59 100644 --- a/ash/tooltips/tooltip_controller.cc +++ b/ash/tooltips/tooltip_controller.cc @@ -265,6 +265,7 @@ bool TooltipController::PreHandleMouseEvent(aura::Window* target, case ui::ET_MOUSE_RELEASED: case ui::ET_MOUSE_DRAGGED: case ui::ET_MOUSEWHEEL: + case ui::ET_MOUSE_CAPTURE_CHANGED: // Hide the tooltip for click, release, drag, wheel events. if (tooltip_->IsVisible()) tooltip_->Hide(); diff --git a/ash/wm/toplevel_window_event_filter.cc b/ash/wm/toplevel_window_event_filter.cc index 88f0307..bbeadb2 100644 --- a/ash/wm/toplevel_window_event_filter.cc +++ b/ash/wm/toplevel_window_event_filter.cc @@ -189,6 +189,7 @@ bool ToplevelWindowEventFilter::PreHandleMouseEvent(aura::Window* target, kBoundsChange_None; case ui::ET_MOUSE_DRAGGED: return HandleDrag(target, event); + case ui::ET_MOUSE_CAPTURE_CHANGED: case ui::ET_MOUSE_RELEASED: CompleteDrag(target); if (in_move_loop_) { |