Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(356)

Unified Diff: examples/echo_terminal/main.cc

Issue 2005103003: Add implementations of mojo::{Run,Terminate}[Main]Application() for "chromium". (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | examples/http_handler/http_handler.cc » ('j') | mojo/application/run_application.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: examples/echo_terminal/main.cc
diff --git a/examples/echo_terminal/main.cc b/examples/echo_terminal/main.cc
index 6c56eafe55b8f46ce00d9c003683ebb9a9ea6de5..518be21f35f76bdea9a57170808068354c92f66f 100644
--- a/examples/echo_terminal/main.cc
+++ b/examples/echo_terminal/main.cc
@@ -8,10 +8,10 @@
#include "base/bind_helpers.h"
#include "base/logging.h"
#include "base/macros.h"
-#include "mojo/application/application_runner_chromium.h"
#include "mojo/common/binding_set.h"
#include "mojo/public/c/system/main.h"
-#include "mojo/public/cpp/application/application_delegate.h"
+#include "mojo/public/cpp/application/application_impl_base.h"
+#include "mojo/public/cpp/application/run_application.h"
#include "mojo/public/cpp/application/service_provider_impl.h"
#include "mojo/services/files/interfaces/file.mojom.h"
#include "mojo/services/files/interfaces/types.mojom.h"
@@ -95,16 +95,15 @@ class TerminalEchoer {
DISALLOW_COPY_AND_ASSIGN(TerminalEchoer);
};
-class EchoTerminalApp
- : public mojo::ApplicationDelegate,
- public mojo::terminal::TerminalClient {
+class EchoTerminalApp : public mojo::ApplicationImplBase,
+ public mojo::terminal::TerminalClient {
public:
EchoTerminalApp() {}
~EchoTerminalApp() override {}
private:
- // |ApplicationDelegate| override:
- bool ConfigureIncomingConnection(
+ // |ApplicationImplBase| override:
+ bool OnAcceptConnection(
mojo::ServiceProviderImpl* service_provider_impl) override {
service_provider_impl->AddService<mojo::terminal::TerminalClient>(
[this](const mojo::ConnectionContext& connection_context,
@@ -130,6 +129,6 @@ class EchoTerminalApp
};
MojoResult MojoMain(MojoHandle application_request) {
- mojo::ApplicationRunnerChromium runner(new EchoTerminalApp());
- return runner.Run(application_request);
+ EchoTerminalApp echo_terminal_app;
+ return mojo::RunMainApplication(application_request, &echo_terminal_app);
}
« no previous file with comments | « no previous file | examples/http_handler/http_handler.cc » ('j') | mojo/application/run_application.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698