diff options
Diffstat (limited to 'chromium/chrome/browser/ui/webui/feed_internals')
4 files changed, 19 insertions, 11 deletions
diff --git a/chromium/chrome/browser/ui/webui/feed_internals/feed_internals_page_handler.cc b/chromium/chrome/browser/ui/webui/feed_internals/feed_internals_page_handler.cc index cbc85825f30..799b7214a10 100644 --- a/chromium/chrome/browser/ui/webui/feed_internals/feed_internals_page_handler.cc +++ b/chromium/chrome/browser/ui/webui/feed_internals/feed_internals_page_handler.cc @@ -12,6 +12,7 @@ #include "base/time/time.h" #include "chrome/browser/android/feed/feed_debugging_bridge.h" #include "chrome/browser/android/feed/feed_lifecycle_bridge.h" +#include "chrome/browser/ui/webui/feed_internals/feed_internals.mojom.h" #include "components/feed/content/feed_host_service.h" #include "components/feed/content/feed_offline_host.h" #include "components/feed/core/feed_scheduler_host.h" @@ -21,6 +22,8 @@ #include "components/offline_pages/core/prefetch/prefetch_prefs.h" #include "components/offline_pages/core/prefetch/suggestions_provider.h" #include "components/prefs/pref_service.h" +#include "mojo/public/cpp/bindings/pending_receiver.h" +#include "mojo/public/cpp/bindings/receiver.h" namespace { @@ -47,10 +50,10 @@ std::string TriggerTypeToString(feed::FeedSchedulerHost::TriggerType* trigger) { } // namespace FeedInternalsPageHandler::FeedInternalsPageHandler( - feed_internals::mojom::PageHandlerRequest request, + mojo::PendingReceiver<feed_internals::mojom::PageHandler> receiver, feed::FeedHostService* feed_host_service, PrefService* pref_service) - : binding_(this, std::move(request)), + : receiver_(this, std::move(receiver)), feed_scheduler_host_(feed_host_service->GetSchedulerHost()), feed_offline_host_(feed_host_service->GetOfflineHost()), pref_service_(pref_service) {} diff --git a/chromium/chrome/browser/ui/webui/feed_internals/feed_internals_page_handler.h b/chromium/chrome/browser/ui/webui/feed_internals/feed_internals_page_handler.h index 2d0352747a4..ab3a646da19 100644 --- a/chromium/chrome/browser/ui/webui/feed_internals/feed_internals_page_handler.h +++ b/chromium/chrome/browser/ui/webui/feed_internals/feed_internals_page_handler.h @@ -10,7 +10,8 @@ #include "base/macros.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ui/webui/feed_internals/feed_internals.mojom.h" -#include "mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/bindings/pending_receiver.h" +#include "mojo/public/cpp/bindings/receiver.h" class PrefService; @@ -27,9 +28,10 @@ struct PrefetchSuggestion; // Concrete implementation of feed_internals::mojom::PageHandler. class FeedInternalsPageHandler : public feed_internals::mojom::PageHandler { public: - FeedInternalsPageHandler(feed_internals::mojom::PageHandlerRequest request, - feed::FeedHostService* feed_host_service, - PrefService* pref_service); + FeedInternalsPageHandler( + mojo::PendingReceiver<feed_internals::mojom::PageHandler> receiver, + feed::FeedHostService* feed_host_service, + PrefService* pref_service); ~FeedInternalsPageHandler() override; // feed_internals::mojom::PageHandler @@ -45,8 +47,7 @@ class FeedInternalsPageHandler : public feed_internals::mojom::PageHandler { void GetFeedHistograms(GetFeedHistogramsCallback) override; private: - // Binding from the mojo interface to concrete implementation. - mojo::Binding<feed_internals::mojom::PageHandler> binding_; + mojo::Receiver<feed_internals::mojom::PageHandler> receiver_; void OnGetCurrentArticleSuggestionsDone( GetCurrentContentCallback callback, diff --git a/chromium/chrome/browser/ui/webui/feed_internals/feed_internals_ui.cc b/chromium/chrome/browser/ui/webui/feed_internals/feed_internals_ui.cc index de2a7c2ab9a..051f6fe93d7 100644 --- a/chromium/chrome/browser/ui/webui/feed_internals/feed_internals_ui.cc +++ b/chromium/chrome/browser/ui/webui/feed_internals/feed_internals_ui.cc @@ -9,10 +9,12 @@ #include "base/bind.h" #include "chrome/browser/android/feed/feed_host_service_factory.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/ui/webui/feed_internals/feed_internals.mojom.h" #include "chrome/browser/ui/webui/feed_internals/feed_internals_page_handler.h" #include "chrome/common/url_constants.h" #include "chrome/grit/browser_resources.h" #include "content/public/browser/web_ui_data_source.h" +#include "mojo/public/cpp/bindings/pending_receiver.h" FeedInternalsUI::FeedInternalsUI(content::WebUI* web_ui) : ui::MojoWebUIController(web_ui), profile_(Profile::FromWebUI(web_ui)) { @@ -35,9 +37,9 @@ FeedInternalsUI::FeedInternalsUI(content::WebUI* web_ui) FeedInternalsUI::~FeedInternalsUI() = default; void FeedInternalsUI::BindFeedInternalsPageHandler( - feed_internals::mojom::PageHandlerRequest request) { + mojo::PendingReceiver<feed_internals::mojom::PageHandler> receiver) { page_handler_ = std::make_unique<FeedInternalsPageHandler>( - std::move(request), + std::move(receiver), feed::FeedHostServiceFactory::GetForBrowserContext(profile_), profile_->GetPrefs()); } diff --git a/chromium/chrome/browser/ui/webui/feed_internals/feed_internals_ui.h b/chromium/chrome/browser/ui/webui/feed_internals/feed_internals_ui.h index 8d6077fb073..662b9bb65bd 100644 --- a/chromium/chrome/browser/ui/webui/feed_internals/feed_internals_ui.h +++ b/chromium/chrome/browser/ui/webui/feed_internals/feed_internals_ui.h @@ -8,7 +8,9 @@ #include <memory> #include "base/macros.h" +#include "chrome/browser/ui/webui/feed_internals/feed_internals.mojom.h" #include "chrome/browser/ui/webui/feed_internals/feed_internals_page_handler.h" +#include "mojo/public/cpp/bindings/pending_receiver.h" #include "ui/webui/mojo_web_ui_controller.h" class Profile; @@ -27,7 +29,7 @@ class FeedInternalsUI : public ui::MojoWebUIController { private: void BindFeedInternalsPageHandler( - feed_internals::mojom::PageHandlerRequest request); + mojo::PendingReceiver<feed_internals::mojom::PageHandler> receiver); Profile* profile_; |