Commit 644230e9 authored by Henrique Ferreiro's avatar Henrique Ferreiro Committed by Commit Bot

Migrate MediaEngagementScoreDetailsProvider to the new Mojo types

Convert the implementation and all users of the
media::mojom::MediaEngagementScoreDetailsProvider interface.

Bug: 955171
Change-Id: Ifd5be6d387550e17b5dc9707f6c82ce3c2acc7ae
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1803293Reviewed-by: default avatarOksana Zhuravlova <oksamyt@chromium.org>
Reviewed-by: default avatarMounir Lamouri <mlamouri@chromium.org>
Commit-Queue: Henrique Ferreiro <hferreiro@igalia.com>
Cr-Commit-Position: refs/heads/master@{#697561}
parent db08e18f
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#include "chrome/browser/ui/webui/media/media_engagement_ui.h" #include "chrome/browser/ui/webui/media/media_engagement_ui.h"
#include <memory> #include <memory>
#include <utility>
#include "base/bind.h" #include "base/bind.h"
#include "base/command_line.h" #include "base/command_line.h"
...@@ -13,6 +14,7 @@ ...@@ -13,6 +14,7 @@
#include "build/build_config.h" #include "build/build_config.h"
#include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process.h"
#include "chrome/browser/media/media_engagement_score.h" #include "chrome/browser/media/media_engagement_score.h"
#include "chrome/browser/media/media_engagement_score_details.mojom.h"
#include "chrome/browser/media/media_engagement_service.h" #include "chrome/browser/media/media_engagement_service.h"
#include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile.h"
#include "chrome/common/url_constants.h" #include "chrome/common/url_constants.h"
...@@ -25,7 +27,8 @@ ...@@ -25,7 +27,8 @@
#include "content/public/browser/web_ui_data_source.h" #include "content/public/browser/web_ui_data_source.h"
#include "content/public/common/web_preferences.h" #include "content/public/common/web_preferences.h"
#include "media/base/media_switches.h" #include "media/base/media_switches.h"
#include "mojo/public/cpp/bindings/binding.h" #include "mojo/public/cpp/bindings/pending_receiver.h"
#include "mojo/public/cpp/bindings/receiver.h"
#if !defined(OS_ANDROID) #if !defined(OS_ANDROID)
#include "chrome/common/pref_names.h" #include "chrome/common/pref_names.h"
...@@ -48,11 +51,11 @@ class MediaEngagementScoreDetailsProviderImpl ...@@ -48,11 +51,11 @@ class MediaEngagementScoreDetailsProviderImpl
public: public:
MediaEngagementScoreDetailsProviderImpl( MediaEngagementScoreDetailsProviderImpl(
content::WebUI* web_ui, content::WebUI* web_ui,
mojo::InterfaceRequest<media::mojom::MediaEngagementScoreDetailsProvider> mojo::PendingReceiver<media::mojom::MediaEngagementScoreDetailsProvider>
request) receiver)
: web_ui_(web_ui), : web_ui_(web_ui),
profile_(Profile::FromWebUI(web_ui)), profile_(Profile::FromWebUI(web_ui)),
binding_(this, std::move(request)) { receiver_(this, std::move(receiver)) {
DCHECK(web_ui_); DCHECK(web_ui_);
DCHECK(profile_); DCHECK(profile_);
service_ = MediaEngagementService::Get(profile_); service_ = MediaEngagementService::Get(profile_);
...@@ -130,7 +133,7 @@ class MediaEngagementScoreDetailsProviderImpl ...@@ -130,7 +133,7 @@ class MediaEngagementScoreDetailsProviderImpl
MediaEngagementService* service_; MediaEngagementService* service_;
mojo::Binding<media::mojom::MediaEngagementScoreDetailsProvider> binding_; mojo::Receiver<media::mojom::MediaEngagementScoreDetailsProvider> receiver_;
DISALLOW_COPY_AND_ASSIGN(MediaEngagementScoreDetailsProviderImpl); DISALLOW_COPY_AND_ASSIGN(MediaEngagementScoreDetailsProviderImpl);
}; };
...@@ -156,7 +159,8 @@ MediaEngagementUI::MediaEngagementUI(content::WebUI* web_ui) ...@@ -156,7 +159,8 @@ MediaEngagementUI::MediaEngagementUI(content::WebUI* web_ui)
MediaEngagementUI::~MediaEngagementUI() = default; MediaEngagementUI::~MediaEngagementUI() = default;
void MediaEngagementUI::BindMediaEngagementScoreDetailsProvider( void MediaEngagementUI::BindMediaEngagementScoreDetailsProvider(
media::mojom::MediaEngagementScoreDetailsProviderRequest request) { mojo::PendingReceiver<media::mojom::MediaEngagementScoreDetailsProvider>
receiver) {
ui_handler_ = std::make_unique<MediaEngagementScoreDetailsProviderImpl>( ui_handler_ = std::make_unique<MediaEngagementScoreDetailsProviderImpl>(
web_ui(), std::move(request)); web_ui(), std::move(receiver));
} }
...@@ -5,8 +5,11 @@ ...@@ -5,8 +5,11 @@
#ifndef CHROME_BROWSER_UI_WEBUI_MEDIA_MEDIA_ENGAGEMENT_UI_H_ #ifndef CHROME_BROWSER_UI_WEBUI_MEDIA_MEDIA_ENGAGEMENT_UI_H_
#define CHROME_BROWSER_UI_WEBUI_MEDIA_MEDIA_ENGAGEMENT_UI_H_ #define CHROME_BROWSER_UI_WEBUI_MEDIA_MEDIA_ENGAGEMENT_UI_H_
#include <memory>
#include "base/macros.h" #include "base/macros.h"
#include "chrome/browser/media/media_engagement_score_details.mojom.h" #include "chrome/browser/media/media_engagement_score_details.mojom.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
#include "ui/webui/mojo_web_ui_controller.h" #include "ui/webui/mojo_web_ui_controller.h"
// The UI for chrome://media-engagement/. // The UI for chrome://media-engagement/.
...@@ -17,7 +20,8 @@ class MediaEngagementUI : public ui::MojoWebUIController { ...@@ -17,7 +20,8 @@ class MediaEngagementUI : public ui::MojoWebUIController {
private: private:
void BindMediaEngagementScoreDetailsProvider( void BindMediaEngagementScoreDetailsProvider(
media::mojom::MediaEngagementScoreDetailsProviderRequest request); mojo::PendingReceiver<media::mojom::MediaEngagementScoreDetailsProvider>
receiver);
std::unique_ptr<media::mojom::MediaEngagementScoreDetailsProvider> std::unique_ptr<media::mojom::MediaEngagementScoreDetailsProvider>
ui_handler_; ui_handler_;
......
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