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

Unified Diff: content/browser/mojo/mojo_application_host.cc

Issue 265793015: Mojo: Replace RemotePtr with InterfacePtr and InterfaceImpl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 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
Index: content/browser/mojo/mojo_application_host.cc
diff --git a/content/browser/mojo/mojo_application_host.cc b/content/browser/mojo/mojo_application_host.cc
index 48d343a26217e7607f546cfefcd854f3b4416c19..efe2ddfb51c2dbfad3d7bd7493cf5a11c78f8850 100644
--- a/content/browser/mojo/mojo_application_host.cc
+++ b/content/browser/mojo/mojo_application_host.cc
@@ -30,7 +30,7 @@ MojoApplicationHost::~MojoApplicationHost() {
}
bool MojoApplicationHost::Init() {
- DCHECK(shell_client_.is_null()) << "Already initialized!";
+ DCHECK(!shell_.get()) << "Already initialized!";
mojo::embedder::PlatformChannelPair channel_pair;
@@ -43,10 +43,7 @@ bool MojoApplicationHost::Init() {
// Forward this to the client once we know its process handle.
client_handle_ = channel_pair.PassClientHandle();
- // TODO(darin): Provide a Shell implementation
- shell_client_.reset(
- mojo::ScopedShellClientHandle::From(message_pipe.Pass()), NULL);
-
+ shell_.reset(BindToPipe(new ShellImpl(), message_pipe.Pass()));
return true;
}
@@ -62,4 +59,14 @@ bool MojoApplicationHost::Activate(IPC::Sender* sender,
return did_activate_;
}
+void MojoApplicationHost::ShellImpl::SetClient(mojo::ShellClient* client) {
+ client_ = client;
+}
+
+void MojoApplicationHost::ShellImpl::Connect(
+ const mojo::String& url,
+ mojo::ScopedMessagePipeHandle handle) {
+ // TODO(darin): Provide something meaningful here.
+}
+
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698