summaryrefslogtreecommitdiffstats
path: root/mojo/dbus
diff options
context:
space:
mode:
authorjiayl@chromium.org <jiayl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-16 00:28:06 +0000
committerjiayl@chromium.org <jiayl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-16 00:28:06 +0000
commitbadf1c4f73b557bb74e6c0516ec87c712b9350d8 (patch)
treecb66c5571e95f94ce28e7da8b8b39392b5dd7dbd /mojo/dbus
parent96a8fa1b58b726ad19c7b86c28b2770d69fa73f6 (diff)
downloadchromium_src-badf1c4f73b557bb74e6c0516ec87c712b9350d8.zip
chromium_src-badf1c4f73b557bb74e6c0516ec87c712b9350d8.tar.gz
chromium_src-badf1c4f73b557bb74e6c0516ec87c712b9350d8.tar.bz2
Revert 270867 "Mojo: Internalize ServiceConnector<>"
Suspected to cause compile failure on Win Builder: http://build.chromium.org/p/chromium.win/builders/Win%20Builder/builds/20401 > Mojo: Internalize ServiceConnector<> > > Authored by davemoore@chromium.org, see https://codereview.chromium.org/275363002/ > > R=viettrungluu@chromium.org, darin@chromium.org > > Review URL: https://codereview.chromium.org/284113009 TBR=darin@chromium.org Review URL: https://codereview.chromium.org/287003004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270873 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/dbus')
-rw-r--r--mojo/dbus/dbus_external_service.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/mojo/dbus/dbus_external_service.h b/mojo/dbus/dbus_external_service.h
index ea72222..c3e20e1 100644
--- a/mojo/dbus/dbus_external_service.h
+++ b/mojo/dbus/dbus_external_service.h
@@ -74,7 +74,7 @@ class DBusExternalService : public DBusExternalServiceBase {
}
virtual void Activate(ScopedMessagePipeHandle shell_handle) OVERRIDE {
app_.reset(new Application(shell_handle.Pass()));
- app_->AddService<ServiceImpl>();
+ app_->AddServiceConnector(new ServiceConnector<ServiceImpl>());
}
private:
DBusExternalService* service_;