diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-19 16:38:23 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-19 16:38:23 +0000 |
| commit | 590a634e603055831bc0aa75480cfa917c8420c1 (patch) | |
| tree | 49e7e7f7edea31fd95d22511aa28a08e51b02931 /chrome/browser/ui/omnibox/omnibox_edit_model.cc | |
| parent | 7175fb1aa0ce9af46b557a8e59930f244df4cdb2 (diff) | |
| download | chromium_src-590a634e603055831bc0aa75480cfa917c8420c1.zip chromium_src-590a634e603055831bc0aa75480cfa917c8420c1.tar.gz chromium_src-590a634e603055831bc0aa75480cfa917c8420c1.tar.bz2 | |
instant: Fix crash from gesture events on instant preview.
The main changes include:
* Rename WebContentsDelegate::HandleMouseActivate to HandlePointerEventActivate
so that it can be used for both mouse and touch events.
* Rename RenderWidgetHostImpl::OnMouseActivate to OnPointerEventActivate.
* Add HandleGestureBegin/HandleGestureEnd to RenderViewHostDelegate and
WebContentsDelegate.
* Process both mouse-press and gesture-begin events in
RenderWidgetHostViewAura::ShouldActivate.
* Activate an aura window from a BEGIN gesture-event instead of a PRESS
touch-event.
BUG=136961
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10810003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147456 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/omnibox/omnibox_edit_model.cc')
| -rw-r--r-- | chrome/browser/ui/omnibox/omnibox_edit_model.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/ui/omnibox/omnibox_edit_model.cc b/chrome/browser/ui/omnibox/omnibox_edit_model.cc index 51282ac..297b4e0 100644 --- a/chrome/browser/ui/omnibox/omnibox_edit_model.cc +++ b/chrome/browser/ui/omnibox/omnibox_edit_model.cc @@ -439,7 +439,7 @@ void OmniboxEditModel::StartAutocomplete( void OmniboxEditModel::StopAutocomplete() { if (popup_->IsOpen() && !in_revert_) { InstantController* instant = controller_->GetInstant(); - if (instant && !instant->commit_on_mouse_up()) + if (instant && !instant->commit_on_pointer_release()) instant->DestroyPreviewContents(); } @@ -1107,7 +1107,7 @@ bool OmniboxEditModel::DoInstant(const AutocompleteMatch& match, // omnibox view if the user clicked the renderer while IME composition was // active. In that case we still want to commit on mouse up, so don't call // Hide(). - if (!instant->commit_on_mouse_up()) + if (!instant->commit_on_pointer_release()) instant->Hide(); return false; } |