Commit a0d79e04 authored by Henrique Ferreiro's avatar Henrique Ferreiro Committed by Commit Bot

Migrate machine_learning_internals_page_handler.mojom to the new Mojo types

Convert the implementation and all users of the
chromeos::machine_learning::mojom::PageHandler interface.

Bug: 955171
Change-Id: Idb8a87b86bad44882dd2828679ffc9376221d547
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1806855
Commit-Queue: Henrique Ferreiro <hferreiro@igalia.com>
Reviewed-by: default avatarKen Rockot <rockot@google.com>
Reviewed-by: default avatarAndrew Moylan <amoylan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#697989}
parent e9d1d961
...@@ -14,8 +14,8 @@ namespace chromeos { ...@@ -14,8 +14,8 @@ namespace chromeos {
namespace machine_learning { namespace machine_learning {
MachineLearningInternalsPageHandler::MachineLearningInternalsPageHandler( MachineLearningInternalsPageHandler::MachineLearningInternalsPageHandler(
mojom::PageHandlerRequest request) mojo::PendingReceiver<mojom::PageHandler> receiver)
: binding_(this, std::move(request)) {} : receiver_(this, std::move(receiver)) {}
MachineLearningInternalsPageHandler::~MachineLearningInternalsPageHandler() = MachineLearningInternalsPageHandler::~MachineLearningInternalsPageHandler() =
default; default;
......
...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
#include "chrome/browser/ui/webui/chromeos/machine_learning/machine_learning_internals_page_handler.mojom.h" #include "chrome/browser/ui/webui/chromeos/machine_learning/machine_learning_internals_page_handler.mojom.h"
#include "chromeos/services/machine_learning/public/mojom/machine_learning_service.mojom.h" #include "chromeos/services/machine_learning/public/mojom/machine_learning_service.mojom.h"
#include "chromeos/services/machine_learning/public/mojom/model.mojom.h" #include "chromeos/services/machine_learning/public/mojom/model.mojom.h"
#include "mojo/public/cpp/bindings/binding.h" #include "mojo/public/cpp/bindings/pending_receiver.h"
#include "mojo/public/cpp/bindings/receiver.h"
namespace chromeos { namespace chromeos {
namespace machine_learning { namespace machine_learning {
...@@ -19,7 +20,7 @@ namespace machine_learning { ...@@ -19,7 +20,7 @@ namespace machine_learning {
class MachineLearningInternalsPageHandler : public mojom::PageHandler { class MachineLearningInternalsPageHandler : public mojom::PageHandler {
public: public:
explicit MachineLearningInternalsPageHandler( explicit MachineLearningInternalsPageHandler(
mojom::PageHandlerRequest request); mojo::PendingReceiver<mojom::PageHandler> receiver);
~MachineLearningInternalsPageHandler() override; ~MachineLearningInternalsPageHandler() override;
private: private:
...@@ -28,7 +29,7 @@ class MachineLearningInternalsPageHandler : public mojom::PageHandler { ...@@ -28,7 +29,7 @@ class MachineLearningInternalsPageHandler : public mojom::PageHandler {
mojom::ModelRequest request, mojom::ModelRequest request,
LoadModelCallback callback) override; LoadModelCallback callback) override;
mojo::Binding<mojom::PageHandler> binding_; mojo::Receiver<mojom::PageHandler> receiver_;
DISALLOW_COPY_AND_ASSIGN(MachineLearningInternalsPageHandler); DISALLOW_COPY_AND_ASSIGN(MachineLearningInternalsPageHandler);
}; };
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include "chrome/browser/ui/webui/chromeos/machine_learning/machine_learning_internals_ui.h" #include "chrome/browser/ui/webui/chromeos/machine_learning/machine_learning_internals_ui.h"
#include <memory>
#include <utility> #include <utility>
#include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile.h"
...@@ -56,9 +57,9 @@ MachineLearningInternalsUI::MachineLearningInternalsUI( ...@@ -56,9 +57,9 @@ MachineLearningInternalsUI::MachineLearningInternalsUI(
MachineLearningInternalsUI::~MachineLearningInternalsUI() = default; MachineLearningInternalsUI::~MachineLearningInternalsUI() = default;
void MachineLearningInternalsUI::BindMachineLearningInternalsPageHandler( void MachineLearningInternalsUI::BindMachineLearningInternalsPageHandler(
mojom::PageHandlerRequest request) { mojo::PendingReceiver<mojom::PageHandler> receiver) {
page_handler_.reset( page_handler_ = std::make_unique<MachineLearningInternalsPageHandler>(
new MachineLearningInternalsPageHandler(std::move(request))); std::move(receiver));
} }
} // namespace machine_learning } // namespace machine_learning
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include "base/macros.h" #include "base/macros.h"
#include "chrome/browser/ui/webui/chromeos/machine_learning/machine_learning_internals_page_handler.mojom.h" #include "chrome/browser/ui/webui/chromeos/machine_learning/machine_learning_internals_page_handler.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"
namespace chromeos { namespace chromeos {
...@@ -24,7 +25,7 @@ class MachineLearningInternalsUI : public ui::MojoWebUIController { ...@@ -24,7 +25,7 @@ class MachineLearningInternalsUI : public ui::MojoWebUIController {
private: private:
void BindMachineLearningInternalsPageHandler( void BindMachineLearningInternalsPageHandler(
mojom::PageHandlerRequest request); mojo::PendingReceiver<mojom::PageHandler> receiver);
std::unique_ptr<MachineLearningInternalsPageHandler> page_handler_; std::unique_ptr<MachineLearningInternalsPageHandler> page_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