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

Unified Diff: chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc

Issue 6685069: Disambiguate OnMouseCaptureLost from OnMouseReleased, etc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments, fix tests, cleanup, etc. Created 9 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc
diff --git a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc
index a3ba14b2a22385056812f3547db44763bc21f9ec..d657e807c3780b437c8d7fe5e935a4581990058e 100644
--- a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc
+++ b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc
@@ -444,10 +444,9 @@ bool AutocompletePopupContentsView::OnMouseDragged(
}
void AutocompletePopupContentsView::OnMouseReleased(
- const views::MouseEvent& event,
- bool canceled) {
- if (canceled || ignore_mouse_drag_) {
- ignore_mouse_drag_ = false;
+ const views::MouseEvent& event) {
+ if (ignore_mouse_drag_) {
+ OnMouseCaptureLost();
return;
}
@@ -458,6 +457,10 @@ void AutocompletePopupContentsView::OnMouseReleased(
OpenIndex(index, CURRENT_TAB);
}
+void AutocompletePopupContentsView::OnMouseCaptureLost() {
+ ignore_mouse_drag_ = false;
+}
+
void AutocompletePopupContentsView::OnMouseMoved(
const views::MouseEvent& event) {
model_->SetHoveredLine(GetIndexForPoint(event.location()));

Powered by Google App Engine
This is Rietveld 408576698