mojo/dbus/dbus_external_service.cc - Issue 346633002: Move channel_init out of mojo_common.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: mojo/dbus/dbus_external_service.cc

Issue 346633002: Move channel_init out of mojo_common. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix exports Created 6 years, 6 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:

Index: mojo/dbus/dbus_external_service.cc

diff --git a/mojo/dbus/dbus_external_service.cc b/mojo/dbus/dbus_external_service.cc

index 3b1fddfa633a1fe5dafe9328c6f91211c1b409c6..a0b8981f3f419aa786e7b049782f6e40c33acc9f 100644

--- a/mojo/dbus/dbus_external_service.cc

+++ b/mojo/dbus/dbus_external_service.cc

@@ -14,7 +14,7 @@

#include "dbus/file_descriptor.h"

#include "dbus/message.h"

#include "dbus/object_path.h"

-#include "mojo/common/channel_init.h"

+#include "mojo/embedder/channel_init.h"

#include "mojo/public/cpp/application/application.h"

#include "mojo/public/cpp/bindings/error_handler.h"

#include "mojo/public/interfaces/service_provider/service_provider.mojom.h"

@@ -50,7 +50,7 @@ void DBusExternalServiceBase::ConnectChannel(

return;

}

wrapped_fd.CheckValidity();

- channel_init_.reset(new mojo::common::ChannelInit);

+ channel_init_.reset(new mojo::embedder::ChannelInit);

mojo::ScopedMessagePipeHandle message_pipe =

channel_init_->Init(wrapped_fd.TakeValue(),

base::MessageLoopProxy::current());

« no previous file with comments | « mojo/dbus/dbus_external_service.h ('k') | mojo/embedder/channel_init.h » ('j') | no next file with comments »