From 5fb0f005c584a7248cb897df8cc0ad859a4e3794 Mon Sep 17 00:00:00 2001 From: Aleksei Kuzmin Date: Fri, 25 Aug 2017 14:23:13 +0300 Subject: [PATCH] Convert SpellCheckPanel SpellCheckPanelHost IPC to mojo https://chromium-review.googlesource.com/c/chromium/src/+/515323 --- atom/renderer/api/atom_api_spell_check_client.h | 6 +++--- atom/renderer/api/atom_api_web_frame.cc | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/atom/renderer/api/atom_api_spell_check_client.h b/atom/renderer/api/atom_api_spell_check_client.h index 9be30a697df7..ce0533a5b193 100644 --- a/atom/renderer/api/atom_api_spell_check_client.h +++ b/atom/renderer/api/atom_api_spell_check_client.h @@ -11,8 +11,8 @@ #include "base/callback.h" #include "chrome/renderer/spellchecker/spellcheck_worditerator.h" #include "native_mate/scoped_persistent.h" +#include "third_party/WebKit/public/platform/WebSpellCheckPanelHostClient.h" #include "third_party/WebKit/public/platform/WebVector.h" -#include "third_party/WebKit/public/web/WebSpellCheckClient.h" #include "third_party/WebKit/public/web/WebTextCheckClient.h" namespace blink { @@ -24,7 +24,7 @@ namespace atom { namespace api { -class SpellCheckClient : public blink::WebSpellCheckClient, +class SpellCheckClient : public blink::WebSpellCheckPanelHostClient, public blink::WebTextCheckClient { public: SpellCheckClient(const std::string& language, @@ -44,7 +44,7 @@ class SpellCheckClient : public blink::WebSpellCheckClient, const blink::WebString& textToCheck, blink::WebTextCheckingCompletion* completionCallback) override; - // blink::WebSpellCheckClient: + // blink::WebSpellCheckPanelHostClient: void ShowSpellingUI(bool show) override; bool IsShowingSpellingUI() override; void UpdateSpellingUIWithMisspelledWord( diff --git a/atom/renderer/api/atom_api_web_frame.cc b/atom/renderer/api/atom_api_web_frame.cc index a265b942f31f..fbda47b29760 100644 --- a/atom/renderer/api/atom_api_web_frame.cc +++ b/atom/renderer/api/atom_api_web_frame.cc @@ -141,7 +141,7 @@ void WebFrame::SetSpellCheckProvider(mate::Arguments* args, spell_check_client_.reset(new SpellCheckClient( language, auto_spell_correct_turned_on, args->isolate(), provider)); - web_frame_->View()->SetSpellCheckClient(spell_check_client_.get()); + web_frame_->SetSpellCheckPanelHostClient(spell_check_client_.get()); web_frame_->SetTextCheckClient(spell_check_client_.get()); }