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

Side by Side Diff: examples/echo_terminal/main.cc

Issue 1682113003: Mojo C++ bindings: Generate InterfaceHandle<> instead of InterfacePtr<>. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: rebase ontop of master, address trung's comments Created 4 years, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <utility>
6
5 #include "base/bind.h" 7 #include "base/bind.h"
6 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
7 #include "base/logging.h" 9 #include "base/logging.h"
8 #include "base/macros.h" 10 #include "base/macros.h"
9 #include "mojo/application/application_runner_chromium.h" 11 #include "mojo/application/application_runner_chromium.h"
10 #include "mojo/common/binding_set.h" 12 #include "mojo/common/binding_set.h"
11 #include "mojo/public/c/system/main.h" 13 #include "mojo/public/c/system/main.h"
12 #include "mojo/public/cpp/application/application_connection.h" 14 #include "mojo/public/cpp/application/application_connection.h"
13 #include "mojo/public/cpp/application/application_delegate.h" 15 #include "mojo/public/cpp/application/application_delegate.h"
14 #include "mojo/public/cpp/application/interface_factory.h" 16 #include "mojo/public/cpp/application/interface_factory.h"
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 } 113 }
112 114
113 // |InterfaceFactory<mojo::terminal::TerminalClient>| implementation: 115 // |InterfaceFactory<mojo::terminal::TerminalClient>| implementation:
114 void Create( 116 void Create(
115 mojo::ApplicationConnection* connection, 117 mojo::ApplicationConnection* connection,
116 mojo::InterfaceRequest<mojo::terminal::TerminalClient> request) override { 118 mojo::InterfaceRequest<mojo::terminal::TerminalClient> request) override {
117 terminal_clients_.AddBinding(this, request.Pass()); 119 terminal_clients_.AddBinding(this, request.Pass());
118 } 120 }
119 121
120 // |mojo::terminal::TerminalClient| implementation: 122 // |mojo::terminal::TerminalClient| implementation:
121 void ConnectToTerminal(mojo::files::FilePtr terminal) override { 123 void ConnectToTerminal(
124 mojo::InterfaceHandle<mojo::files::File> terminal) override {
122 DCHECK(terminal); 125 DCHECK(terminal);
123 // The |TerminalEchoer| will own itself. 126 // The |TerminalEchoer| will own itself.
124 (new TerminalEchoer(terminal.Pass()))->StartReading(); 127 (new TerminalEchoer(mojo::files::FilePtr::Create(std::move(terminal))))
128 ->StartReading();
125 } 129 }
126 130
127 mojo::BindingSet<mojo::terminal::TerminalClient> terminal_clients_; 131 mojo::BindingSet<mojo::terminal::TerminalClient> terminal_clients_;
128 132
129 DISALLOW_COPY_AND_ASSIGN(EchoTerminalApp); 133 DISALLOW_COPY_AND_ASSIGN(EchoTerminalApp);
130 }; 134 };
131 135
132 MojoResult MojoMain(MojoHandle application_request) { 136 MojoResult MojoMain(MojoHandle application_request) {
133 mojo::ApplicationRunnerChromium runner(new EchoTerminalApp()); 137 mojo::ApplicationRunnerChromium runner(new EchoTerminalApp());
134 return runner.Run(application_request); 138 return runner.Run(application_request);
135 } 139 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698