bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

alloy: win: Add spelling suggestions in context menu (fixes #3055)

Browse Source
This commit is contained in:
Michael Bragg
2025-03-18 12:08:47 -04:00
committed by Marshall Greenblatt
parent f72afb713a
commit aa4734b714
2 changed files with 53 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
libcef/browser/menu_manager.cc
View File

@ -20,6 +20,12 @@
#include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/render_widget_host_view.h"
#include "third_party/blink/public/mojom/context_menu/context_menu.mojom.h" #include "third_party/blink/public/mojom/context_menu/context_menu.mojom.h"
#if BUILDFLAG(IS_WIN)
#include "chrome/browser/spellchecker/spellcheck_factory.h"
#include "chrome/browser/spellchecker/spellcheck_service.h"
#include "components/spellcheck/browser/spellcheck_platform.h"
#endif
namespace { namespace {
CefString GetLabel(int message_id) { CefString GetLabel(int message_id) {
@ -120,8 +126,8 @@ bool CefMenuManager::IsShowingContextMenu() {
return web_contents()->IsShowingContextMenu(); return web_contents()->IsShowingContextMenu();
} }
bool CefMenuManager::CreateContextMenu( bool CefMenuManager::CreateContextMenu(const content::ContextMenuParams& params,
const content::ContextMenuParams& params) { bool query_spellcheck) {
// The renderer may send the "show context menu" message multiple times, one // The renderer may send the "show context menu" message multiple times, one
// for each right click mouse event it receives. Normally, this doesn't happen // for each right click mouse event it receives. Normally, this doesn't happen
// because mouse events are not forwarded once the context menu is showing. // because mouse events are not forwarded once the context menu is showing.
@ -134,6 +140,24 @@ bool CefMenuManager::CreateContextMenu(
} }
params_ = params; params_ = params;
#if BUILDFLAG(IS_WIN)
// System spellcheck suggestions need to be queried asynchronously.
if (query_spellcheck && !params_.misspelled_word.empty() &&
params_.dictionary_suggestions.empty()) {
SpellcheckService* spellcheck_service =
SpellcheckServiceFactory::GetForContext(
browser_->web_contents()->GetBrowserContext());
if (spellcheck_service) {
spellcheck_platform::GetPerLanguageSuggestions(
spellcheck_service->platform_spell_checker(), params_.misspelled_word,
base::BindOnce(&CefMenuManager::OnGetPlatformSuggestionsComplete,
weak_ptr_factory_.GetWeakPtr()));
}
return true;
}
#endif
model_->Clear(); model_->Clear();
// Create the default menu model. // Create the default menu model.
@ -511,3 +535,18 @@ bool CefMenuManager::IsCustomContextMenuCommand(int command_id) {
} }
return false; return false;
} }
#if BUILDFLAG(IS_WIN)
void CefMenuManager::OnGetPlatformSuggestionsComplete(
const spellcheck::PerLanguageSuggestions&
platform_per_language_suggestions) {
std::vector<std::u16string> combined_suggestions;
spellcheck::FillSuggestions(platform_per_language_suggestions,
&combined_suggestions);
params_.dictionary_suggestions = combined_suggestions;
// Now that we have spelling suggestions, call CreateContextMenu again.
CreateContextMenu(params_, /*query_spellcheck=*/false);
}
#endif

13
libcef/browser/menu_manager.h
View File

@ -13,6 +13,10 @@
#include "content/public/browser/context_menu_params.h" #include "content/public/browser/context_menu_params.h"
#include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_contents_observer.h"
#if BUILDFLAG(IS_WIN)
#include "components/spellcheck/common/spellcheck_common.h"
#endif
namespace content { namespace content {
class RenderFrameHost; class RenderFrameHost;
class WebContents; class WebContents;
@ -39,7 +43,8 @@ class CefMenuManager : public CefMenuModelImpl::Delegate,
bool IsShowingContextMenu(); bool IsShowingContextMenu();
// Create the context menu. // Create the context menu.
bool CreateContextMenu(const content::ContextMenuParams& params); bool CreateContextMenu(const content::ContextMenuParams& params,
bool query_spellcheck = true);
void CancelContextMenu(); void CancelContextMenu();
private: private:
@ -62,6 +67,12 @@ class CefMenuManager : public CefMenuModelImpl::Delegate,
// Returns true if the specified id is a custom context menu command. // Returns true if the specified id is a custom context menu command.
bool IsCustomContextMenuCommand(int command_id); bool IsCustomContextMenuCommand(int command_id);
#if BUILDFLAG(IS_WIN)
void OnGetPlatformSuggestionsComplete(
const spellcheck::PerLanguageSuggestions&
platform_per_language_suggestions);
#endif
// AlloyBrowserHostImpl pointer is guaranteed to outlive this object. // AlloyBrowserHostImpl pointer is guaranteed to outlive this object.
raw_ptr<AlloyBrowserHostImpl> browser_; raw_ptr<AlloyBrowserHostImpl> browser_;