Commit e6e768e9 authored by Johann's avatar Johann Committed by Commit Bot

mojo: update examples to follow styleguide

Remove usage of DISALLOW_COPY_AND_ASSIGN from mojo documentation.

styleguide/c++/c++-dos-and-donts.md:
'DISALLOW_COPY_AND_ASSIGN` is deprecated.  For
a non-copyable/movable type, delete the copy operations (the move
operations will be implicitly deleted); otherwise, declare either
copy operations, move operations, or both (a non-declared pair
will be implicitly deleted).  Always declare or delete both
construction and assignment, not just one (which can introduce
subtle bugs).

Change-Id: Iad752e093643a0f964056c1d4b6714cea724728f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2398069Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Commit-Queue: Johann Koenig <johannkoenig@google.com>
Cr-Commit-Position: refs/heads/master@{#805164}
parent 01bd19eb
...@@ -180,6 +180,8 @@ class PingResponderImpl : example::mojom::PingResponder { ...@@ -180,6 +180,8 @@ class PingResponderImpl : example::mojom::PingResponder {
public: public:
explicit PingResponderImpl(mojo::PendingReceiver<example::mojom::PingResponder> receiver) explicit PingResponderImpl(mojo::PendingReceiver<example::mojom::PingResponder> receiver)
: receiver_(this, std::move(receiver)) {} : receiver_(this, std::move(receiver)) {}
PingResponderImpl(const PingResponderImpl&) = delete;
PingResponderImpl& operator=(const PingResponderImpl&) = delete;
// example::mojom::PingResponder: // example::mojom::PingResponder:
void Ping(PingCallback callback) override { void Ping(PingCallback callback) override {
...@@ -189,8 +191,6 @@ class PingResponderImpl : example::mojom::PingResponder { ...@@ -189,8 +191,6 @@ class PingResponderImpl : example::mojom::PingResponder {
private: private:
mojo::Receiver<example::mojom::PingResponder> receiver_; mojo::Receiver<example::mojom::PingResponder> receiver_;
DISALLOW_COPY_AND_ASSIGN(PingResponderImpl);
}; };
``` ```
...@@ -303,6 +303,8 @@ class MathService : public mojom::MathService { ...@@ -303,6 +303,8 @@ class MathService : public mojom::MathService {
public: public:
explicit MathService(mojo::PendingReceiver<mojom::MathService> receiver); explicit MathService(mojo::PendingReceiver<mojom::MathService> receiver);
~MathService() override; ~MathService() override;
MathService(const MathService&) = delete;
MathService& operator=(const MathService&) = delete;
private: private:
// mojom::MathService: // mojom::MathService:
...@@ -311,8 +313,6 @@ class MathService : public mojom::MathService { ...@@ -311,8 +313,6 @@ class MathService : public mojom::MathService {
DivideCallback callback) override; DivideCallback callback) override;
mojo::Receiver<mojom::MathService> receiver_; mojo::Receiver<mojom::MathService> receiver_;
DISALLOW_COPY_AND_ASSIGN(MathService);
}; };
} // namespace math } // namespace math
......
...@@ -237,6 +237,8 @@ class LoggerImpl : public sample::mojom::Logger { ...@@ -237,6 +237,8 @@ class LoggerImpl : public sample::mojom::Logger {
explicit LoggerImpl(mojo::PendingReceiver<sample::mojom::Logger> receiver) explicit LoggerImpl(mojo::PendingReceiver<sample::mojom::Logger> receiver)
: receiver_(this, std::move(receiver)) {} : receiver_(this, std::move(receiver)) {}
~Logger() override {} ~Logger() override {}
Logger(const Logger&) = delete;
Logger& operator=(const Logger&) = delete;
// sample::mojom::Logger: // sample::mojom::Logger:
void Log(const std::string& message) override { void Log(const std::string& message) override {
...@@ -245,8 +247,6 @@ class LoggerImpl : public sample::mojom::Logger { ...@@ -245,8 +247,6 @@ class LoggerImpl : public sample::mojom::Logger {
private: private:
mojo::Receiver<sample::mojom::Logger> receiver_; mojo::Receiver<sample::mojom::Logger> receiver_;
DISALLOW_COPY_AND_ASSIGN(LoggerImpl);
}; };
``` ```
...@@ -331,6 +331,8 @@ class LoggerImpl : public sample::mojom::Logger { ...@@ -331,6 +331,8 @@ class LoggerImpl : public sample::mojom::Logger {
explicit LoggerImpl(mojo::PendingReceiver<sample::mojom::Logger> receiver) explicit LoggerImpl(mojo::PendingReceiver<sample::mojom::Logger> receiver)
: receiver_(this, std::move(receiver)) {} : receiver_(this, std::move(receiver)) {}
~Logger() override {} ~Logger() override {}
Logger(const Logger&) = delete;
Logger& operator=(const Logger&) = delete;
// sample::mojom::Logger: // sample::mojom::Logger:
void Log(const std::string& message) override { void Log(const std::string& message) override {
...@@ -345,8 +347,6 @@ class LoggerImpl : public sample::mojom::Logger { ...@@ -345,8 +347,6 @@ class LoggerImpl : public sample::mojom::Logger {
private: private:
mojo::Receiver<sample::mojom::Logger> receiver_; mojo::Receiver<sample::mojom::Logger> receiver_;
std::vector<std::string> lines_; std::vector<std::string> lines_;
DISALLOW_COPY_AND_ASSIGN(LoggerImpl);
}; };
``` ```
......
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