Commit ad7d1c28 authored by Gyuyoung Kim's avatar Gyuyoung Kim Committed by Commit Bot

Clean up all old uses of SpellCheckPanelHost

This CL converts SpellCheckPanelHostPtr|Request to the new Mojo
types. Major changes are as below,

  - Convert mojom::SpellCheckPanelHostPtr to
    mojo::Remote<mojom::SpellCheckPanelHost>
  - Convert mojo::SpellCheckPanelHostRequest to
    mojo::PendingReceiver<mojom::SpellCheckPanelHost>
  - Convert mojo::BindingSet to mojo::ReceiverSet

Bug: 955171
Change-Id: I2e8934227b97a685cb02c9c1a7a00b2ed0b3c746
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1935967Reviewed-by: default avatarRouslan Solomakhin <rouslan@chromium.org>
Reviewed-by: default avatarJeremy Roman <jbroman@chromium.org>
Commit-Queue: Gyuyoung Kim <gyuyoung@igalia.com>
Cr-Commit-Position: refs/heads/master@{#719952}
parent 6a7ec6ab
...@@ -25,9 +25,9 @@ bool SpellCheckMockPanelHost::SpellingPanelVisible() { ...@@ -25,9 +25,9 @@ bool SpellCheckMockPanelHost::SpellingPanelVisible() {
return spelling_panel_visible_; return spelling_panel_visible_;
} }
void SpellCheckMockPanelHost::SpellCheckPanelHostRequest( void SpellCheckMockPanelHost::BindReceiver(
spellcheck::mojom::SpellCheckPanelHostRequest request) { mojo::PendingReceiver<spellcheck::mojom::SpellCheckPanelHost> receiver) {
bindings_.AddBinding(this, std::move(request)); receivers_.Add(this, std::move(receiver));
} }
// spellcheck::mojom::SpellCheckPanelHost: // spellcheck::mojom::SpellCheckPanelHost:
......
...@@ -8,7 +8,8 @@ ...@@ -8,7 +8,8 @@
#include "base/callback.h" #include "base/callback.h"
#include "components/spellcheck/common/spellcheck_panel.mojom.h" #include "components/spellcheck/common/spellcheck_panel.mojom.h"
#include "content/public/browser/render_process_host.h" #include "content/public/browser/render_process_host.h"
#include "mojo/public/cpp/bindings/binding_set.h" #include "mojo/public/cpp/bindings/pending_receiver.h"
#include "mojo/public/cpp/bindings/receiver_set.h"
namespace spellcheck { namespace spellcheck {
...@@ -20,8 +21,8 @@ class SpellCheckMockPanelHost : public spellcheck::mojom::SpellCheckPanelHost { ...@@ -20,8 +21,8 @@ class SpellCheckMockPanelHost : public spellcheck::mojom::SpellCheckPanelHost {
content::RenderProcessHost* process_host() const { return process_host_; } content::RenderProcessHost* process_host() const { return process_host_; }
bool SpellingPanelVisible(); bool SpellingPanelVisible();
void SpellCheckPanelHostRequest( void BindReceiver(
spellcheck::mojom::SpellCheckPanelHostRequest request); mojo::PendingReceiver<spellcheck::mojom::SpellCheckPanelHost> receiver);
private: private:
// spellcheck::mojom::SpellCheckPanelHost: // spellcheck::mojom::SpellCheckPanelHost:
...@@ -29,7 +30,7 @@ class SpellCheckMockPanelHost : public spellcheck::mojom::SpellCheckPanelHost { ...@@ -29,7 +30,7 @@ class SpellCheckMockPanelHost : public spellcheck::mojom::SpellCheckPanelHost {
void UpdateSpellingPanelWithMisspelledWord( void UpdateSpellingPanelWithMisspelledWord(
const base::string16& word) override; const base::string16& word) override;
mojo::BindingSet<spellcheck::mojom::SpellCheckPanelHost> bindings_; mojo::ReceiverSet<spellcheck::mojom::SpellCheckPanelHost> receivers_;
content::RenderProcessHost* process_host_; content::RenderProcessHost* process_host_;
bool show_spelling_panel_called_ = false; bool show_spelling_panel_called_ = false;
bool spelling_panel_visible_ = false; bool spelling_panel_visible_ = false;
......
...@@ -47,10 +47,14 @@ void SpellCheckPanelBrowserTestHelper::BindSpellCheckPanelHost( ...@@ -47,10 +47,14 @@ void SpellCheckPanelBrowserTestHelper::BindSpellCheckPanelHost(
mojo::PendingReceiver<spellcheck::mojom::SpellCheckPanelHost> receiver) { mojo::PendingReceiver<spellcheck::mojom::SpellCheckPanelHost> receiver) {
content::RenderProcessHost* render_process_host = content::RenderProcessHost* render_process_host =
content::RenderProcessHost::FromID(render_process_id); content::RenderProcessHost::FromID(render_process_id);
auto spell_check_panel_host = auto* spell_check_panel_host =
std::make_unique<SpellCheckMockPanelHost>(render_process_host); GetSpellCheckMockPanelHostForProcess(render_process_host);
spell_check_panel_host->SpellCheckPanelHostRequest(std::move(receiver)); if (!spell_check_panel_host) {
hosts_.push_back(std::move(spell_check_panel_host)); hosts_.push_back(
std::make_unique<SpellCheckMockPanelHost>(render_process_host));
spell_check_panel_host = hosts_.back().get();
}
spell_check_panel_host->BindReceiver(std::move(receiver));
std::move(quit_on_bind_closure_).Run(); std::move(quit_on_bind_closure_).Run();
} }
} // namespace spellcheck } // namespace spellcheck
...@@ -72,9 +72,10 @@ void SpellCheckPanel::ToggleSpellPanel(bool visible) { ...@@ -72,9 +72,10 @@ void SpellCheckPanel::ToggleSpellPanel(bool visible) {
blink::WebString::FromUTF8("ToggleSpellPanel")); blink::WebString::FromUTF8("ToggleSpellPanel"));
} }
spellcheck::mojom::SpellCheckPanelHostPtr mojo::Remote<spellcheck::mojom::SpellCheckPanelHost>
SpellCheckPanel::GetSpellCheckPanelHost() { SpellCheckPanel::GetSpellCheckPanelHost() {
spellcheck::mojom::SpellCheckPanelHostPtr spell_check_panel_host; mojo::Remote<spellcheck::mojom::SpellCheckPanelHost> spell_check_panel_host;
embedder_provider_->GetInterface(&spell_check_panel_host); embedder_provider_->GetInterface(
spell_check_panel_host.BindNewPipeAndPassReceiver());
return spell_check_panel_host; return spell_check_panel_host;
} }
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include "content/public/renderer/render_frame_observer.h" #include "content/public/renderer/render_frame_observer.h"
#include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/pending_receiver.h"
#include "mojo/public/cpp/bindings/receiver_set.h" #include "mojo/public/cpp/bindings/receiver_set.h"
#include "mojo/public/cpp/bindings/remote.h"
#include "services/service_manager/public/cpp/binder_registry.h" #include "services/service_manager/public/cpp/binder_registry.h"
#include "third_party/blink/public/platform/web_spell_check_panel_host_client.h" #include "third_party/blink/public/platform/web_spell_check_panel_host_client.h"
...@@ -49,7 +50,7 @@ class SpellCheckPanel : public content::RenderFrameObserver, ...@@ -49,7 +50,7 @@ class SpellCheckPanel : public content::RenderFrameObserver,
void ToggleSpellPanel(bool visible) override; void ToggleSpellPanel(bool visible) override;
void AdvanceToNextMisspelling() override; void AdvanceToNextMisspelling() override;
spellcheck::mojom::SpellCheckPanelHostPtr GetSpellCheckPanelHost(); mojo::Remote<spellcheck::mojom::SpellCheckPanelHost> GetSpellCheckPanelHost();
// SpellCheckPanel receivers. // SpellCheckPanel receivers.
mojo::ReceiverSet<spellcheck::mojom::SpellCheckPanel> receivers_; mojo::ReceiverSet<spellcheck::mojom::SpellCheckPanel> receivers_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment