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

Unified Diff: mojo/dbus/dbus_external_service.h

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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/common/channel_init.cc ('k') | mojo/dbus/dbus_external_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/dbus/dbus_external_service.h
diff --git a/mojo/dbus/dbus_external_service.h b/mojo/dbus/dbus_external_service.h
index 54af5e97058e6e9b9b8eeb7681027eac50e462d0..213c074f993d08df30148fede2537cd4a41c2af6 100644
--- a/mojo/dbus/dbus_external_service.h
+++ b/mojo/dbus/dbus_external_service.h
@@ -7,7 +7,7 @@
#include "dbus/exported_object.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/interfaces/service_provider/service_provider.mojom.h"
#include "mojo/shell/external_service.mojom.h"
@@ -43,7 +43,7 @@ class DBusExternalServiceBase {
const std::string service_name_;
scoped_refptr<dbus::Bus> bus_;
dbus::ExportedObject* exported_object_; // Owned by bus_;
- scoped_ptr<common::ChannelInit> channel_init_;
+ scoped_ptr<embedder::ChannelInit> channel_init_;
DISALLOW_COPY_AND_ASSIGN(DBusExternalServiceBase);
};
« no previous file with comments | « mojo/common/channel_init.cc ('k') | mojo/dbus/dbus_external_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698