Commit 53ddf785 authored by Miyoung Shin's avatar Miyoung Shin Committed by Commit Bot

Convert TextSuggestionHost to new Mojo types

This CL converts TextSuggestionHostPtr in blink and
TextSuggestionHostRequest in content to the new Mojo types.

Bug: 955171, 978694
Change-Id: Ic56dc8f8c4a2f2aacf0e0da073d0bef63d3b4186
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1777468Reviewed-by: default avatarOksana Zhuravlova <oksamyt@chromium.org>
Reviewed-by: default avatarTed Choc <tedchoc@chromium.org>
Commit-Queue: Miyoung Shin <myid.shin@igalia.com>
Cr-Commit-Position: refs/heads/master@{#692316}
parent d883302b
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include "content/browser/android/text_suggestion_host_mojo_impl_android.h" #include "content/browser/android/text_suggestion_host_mojo_impl_android.h"
#include "content/browser/android/text_suggestion_host_android.h" #include "content/browser/android/text_suggestion_host_android.h"
#include "mojo/public/cpp/bindings/strong_binding.h" #include "mojo/public/cpp/bindings/self_owned_receiver.h"
namespace content { namespace content {
...@@ -16,10 +16,10 @@ TextSuggestionHostMojoImplAndroid::TextSuggestionHostMojoImplAndroid( ...@@ -16,10 +16,10 @@ TextSuggestionHostMojoImplAndroid::TextSuggestionHostMojoImplAndroid(
// static // static
void TextSuggestionHostMojoImplAndroid::Create( void TextSuggestionHostMojoImplAndroid::Create(
TextSuggestionHostAndroid* text_suggestion_host, TextSuggestionHostAndroid* text_suggestion_host,
blink::mojom::TextSuggestionHostRequest request) { mojo::PendingReceiver<blink::mojom::TextSuggestionHost> receiver) {
mojo::MakeStrongBinding( mojo::MakeSelfOwnedReceiver(
std::make_unique<TextSuggestionHostMojoImplAndroid>(text_suggestion_host), std::make_unique<TextSuggestionHostMojoImplAndroid>(text_suggestion_host),
std::move(request)); std::move(receiver));
} }
void TextSuggestionHostMojoImplAndroid::StartSuggestionMenuTimer() { void TextSuggestionHostMojoImplAndroid::StartSuggestionMenuTimer() {
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#ifndef CONTENT_BROWSER_ANDROID_TEXT_SUGGESTION_HOST_MOJO_IMPL_ANDROID_H_ #ifndef CONTENT_BROWSER_ANDROID_TEXT_SUGGESTION_HOST_MOJO_IMPL_ANDROID_H_
#define CONTENT_BROWSER_ANDROID_TEXT_SUGGESTION_HOST_MOJO_IMPL_ANDROID_H_ #define CONTENT_BROWSER_ANDROID_TEXT_SUGGESTION_HOST_MOJO_IMPL_ANDROID_H_
#include "mojo/public/cpp/bindings/pending_receiver.h"
#include "third_party/blink/public/mojom/input/input_host.mojom.h" #include "third_party/blink/public/mojom/input/input_host.mojom.h"
namespace content { namespace content {
...@@ -17,8 +18,9 @@ class TextSuggestionHostMojoImplAndroid final ...@@ -17,8 +18,9 @@ class TextSuggestionHostMojoImplAndroid final
public: public:
explicit TextSuggestionHostMojoImplAndroid(TextSuggestionHostAndroid*); explicit TextSuggestionHostMojoImplAndroid(TextSuggestionHostAndroid*);
static void Create(TextSuggestionHostAndroid*, static void Create(
blink::mojom::TextSuggestionHostRequest request); TextSuggestionHostAndroid*,
mojo::PendingReceiver<blink::mojom::TextSuggestionHost> receiver);
void StartSuggestionMenuTimer() final; void StartSuggestionMenuTimer() final;
......
...@@ -235,7 +235,7 @@ void TextSuggestionController::HandlePotentialSuggestionTap( ...@@ -235,7 +235,7 @@ void TextSuggestionController::HandlePotentialSuggestionTap(
if (!text_suggestion_host_) { if (!text_suggestion_host_) {
GetFrame().GetInterfaceProvider().GetInterface( GetFrame().GetInterfaceProvider().GetInterface(
mojo::MakeRequest(&text_suggestion_host_)); text_suggestion_host_.BindNewPipeAndPassReceiver());
} }
text_suggestion_host_->StartSuggestionMenuTimer(); text_suggestion_host_->StartSuggestionMenuTimer();
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#define THIRD_PARTY_BLINK_RENDERER_CORE_EDITING_SUGGESTION_TEXT_SUGGESTION_CONTROLLER_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_EDITING_SUGGESTION_TEXT_SUGGESTION_CONTROLLER_H_
#include <utility> #include <utility>
#include "mojo/public/cpp/bindings/remote.h"
#include "third_party/blink/public/mojom/input/input_host.mojom-blink.h" #include "third_party/blink/public/mojom/input/input_host.mojom-blink.h"
#include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/core/core_export.h"
#include "third_party/blink/renderer/core/dom/document.h" #include "third_party/blink/renderer/core/dom/document.h"
...@@ -74,7 +75,7 @@ class CORE_EXPORT TextSuggestionController final ...@@ -74,7 +75,7 @@ class CORE_EXPORT TextSuggestionController final
bool is_suggestion_menu_open_; bool is_suggestion_menu_open_;
const Member<LocalFrame> frame_; const Member<LocalFrame> frame_;
mojom::blink::TextSuggestionHostPtr text_suggestion_host_; mojo::Remote<mojom::blink::TextSuggestionHost> text_suggestion_host_;
DISALLOW_COPY_AND_ASSIGN(TextSuggestionController); DISALLOW_COPY_AND_ASSIGN(TextSuggestionController);
}; };
......
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