diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-15 00:16:59 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-15 00:16:59 +0000 |
| commit | a8dffcec83c5eba7b9f17b03e0e35f28b44a8d52 (patch) | |
| tree | 27e7dc26d245d83d5a8b81318d236d19e0ae0c21 /content | |
| parent | 06ea3e51e4ca77a6e16f549eff9094c472786f91 (diff) | |
| download | chromium_src-a8dffcec83c5eba7b9f17b03e0e35f28b44a8d52.zip chromium_src-a8dffcec83c5eba7b9f17b03e0e35f28b44a8d52.tar.gz chromium_src-a8dffcec83c5eba7b9f17b03e0e35f28b44a8d52.tar.bz2 | |
Take 2 at: Changes RootWindow capture code so that we only have one capture
type. Makes gesture generated mouse events use the right mouse
generating code so that we generate the correct enter/exit/moved
events and update the appropriate state.
BUG=115684
TEST=covered by unit tests
TBR=sadrul@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10332141
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137030 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/renderer_host/render_widget_host_view_aura.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc index 53084ff..0d16c71 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc @@ -682,7 +682,7 @@ bool RenderWidgetHostViewAura::LockMouse() { mouse_locked_ = true; - root_window->SetCapture(window_, ui::CW_LOCK_MOUSE); + root_window->SetCapture(window_); if (root_window->ConfineCursorToWindow()) { root_window->ShowCursor(false); synthetic_move_sent_ = true; @@ -1014,7 +1014,7 @@ bool RenderWidgetHostViewAura::OnMouseEvent(aura::MouseEvent* event) { switch (event->type()) { case ui::ET_MOUSE_PRESSED: - window_->SetCapture(ui::CW_LOCK_MOUSE); + window_->SetCapture(); // Confirm existing composition text on mouse click events, to make sure // the input caret won't be moved with an ongoing composition text. FinishImeCompositionSession(); |