| Index: content/browser/renderer_host/input/touch_selection_controller_client_aura.cc
|
| diff --git a/content/browser/renderer_host/input/touch_selection_controller_client_aura.cc b/content/browser/renderer_host/input/touch_selection_controller_client_aura.cc
|
| index 92c33f4d5ca5c035740460898b63bcd1f38ab41e..1bf91a5447060e31afbc5159cc7474d592c4993d 100644
|
| --- a/content/browser/renderer_host/input/touch_selection_controller_client_aura.cc
|
| +++ b/content/browser/renderer_host/input/touch_selection_controller_client_aura.cc
|
| @@ -157,9 +157,10 @@ void TouchSelectionControllerClientAura::OnScrollCompleted() {
|
| bool TouchSelectionControllerClientAura::HandleContextMenu(
|
| const ContextMenuParams& params) {
|
| if (params.source_type == ui::MENU_SOURCE_LONG_PRESS &&
|
| - params.is_editable &&
|
| - params.selection_text.empty() &&
|
| + rwhva_->selection_controller()->insertion_active_or_requested() &&
|
| IsQuickMenuAvailable()) {
|
| + DCHECK(params.is_editable);
|
| + DCHECK(params.selection_text.empty());
|
| quick_menu_requested_ = true;
|
| UpdateQuickMenu();
|
| return true;
|
| @@ -299,6 +300,9 @@ void TouchSelectionControllerClientAura::OnSelectionEvent(
|
| quick_menu_requested_ = !quick_menu_requested_;
|
| UpdateQuickMenu();
|
| break;
|
| + case ui::SELECTION_ESTABLISHED:
|
| + case ui::SELECTION_DISSOLVED:
|
| + break;
|
| };
|
| }
|
|
|
|
|