diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-18 14:34:04 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-10-04 11:15:27 +0000 |
| commit | e6430e577f105ad8813c92e75c54660c4985026e (patch) | |
| tree | 88115e5d1fb471fea807111924dcccbeadbf9e4f /chromium/components/renderer_context_menu | |
| parent | 53d399fe6415a96ea6986ec0d402a9c07da72453 (diff) | |
| download | qtwebengine-chromium-e6430e577f105ad8813c92e75c54660c4985026e.tar.gz | |
BASELINE: Update Chromium to 61.0.3163.99
Change-Id: I8452f34574d88ca2b27af9bd56fc9ff3f16b1367
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/components/renderer_context_menu')
| -rw-r--r-- | chromium/components/renderer_context_menu/context_menu_content_type.cc | 4 | ||||
| -rw-r--r-- | chromium/components/renderer_context_menu/render_view_context_menu_base.cc | 10 |
2 files changed, 5 insertions, 9 deletions
diff --git a/chromium/components/renderer_context_menu/context_menu_content_type.cc b/chromium/components/renderer_context_menu/context_menu_content_type.cc index d62e040cf78..95dae075636 100644 --- a/chromium/components/renderer_context_menu/context_menu_content_type.cc +++ b/chromium/components/renderer_context_menu/context_menu_content_type.cc @@ -77,6 +77,8 @@ bool ContextMenuContentType::SupportsGroup(int group) { bool ContextMenuContentType::SupportsGroupInternal(int group) { const bool has_link = !params_.unfiltered_link_url.is_empty(); const bool has_selection = !params_.selection_text.empty(); + const bool is_password = + params_.input_field_type == WebContextMenuData::kInputFieldTypePassword; switch (group) { case ITEM_GROUP_CUSTOM: @@ -136,7 +138,7 @@ bool ContextMenuContentType::SupportsGroupInternal(int group) { return !params_.is_editable && has_selection; case ITEM_GROUP_SEARCH_PROVIDER: - return has_selection; + return has_selection && !is_password; case ITEM_GROUP_PRINT: { // Image menu items also imply print items. diff --git a/chromium/components/renderer_context_menu/render_view_context_menu_base.cc b/chromium/components/renderer_context_menu/render_view_context_menu_base.cc index f9663f333e3..709931ac804 100644 --- a/chromium/components/renderer_context_menu/render_view_context_menu_base.cc +++ b/chromium/components/renderer_context_menu/render_view_context_menu_base.cc @@ -333,10 +333,7 @@ void RenderViewContextMenuBase::MenuWillShow(ui::SimpleMenuModel* source) { if (source != &menu_model_) return; - content::RenderWidgetHostView* view = - source_web_contents_->GetRenderWidgetHostView(); - if (view) - view->SetShowingContextMenu(true); + source_web_contents_->SetShowingContextMenu(true); NotifyMenuShown(); } @@ -346,10 +343,7 @@ void RenderViewContextMenuBase::MenuClosed(ui::SimpleMenuModel* source) { if (source != &menu_model_) return; - content::RenderWidgetHostView* view = - source_web_contents_->GetRenderWidgetHostView(); - if (view) - view->SetShowingContextMenu(false); + source_web_contents_->SetShowingContextMenu(false); source_web_contents_->NotifyContextMenuClosed(params_.custom_context); } |