| Index: mojo/public/cpp/bindings/lib/multiplex_router.cc
|
| diff --git a/mojo/public/cpp/bindings/lib/multiplex_router.cc b/mojo/public/cpp/bindings/lib/multiplex_router.cc
|
| index a2b057be9fbd7d3389254dca2cb25f3924d57156..c09fc17ff4b2ad9deee6d513589f6b5bd1a8f524 100644
|
| --- a/mojo/public/cpp/bindings/lib/multiplex_router.cc
|
| +++ b/mojo/public/cpp/bindings/lib/multiplex_router.cc
|
| @@ -7,6 +7,7 @@
|
| #include "base/bind.h"
|
| #include "base/message_loop/message_loop.h"
|
| #include "base/stl_util.h"
|
| +#include "mojo/public/cpp/bindings/associated_group.h"
|
| #include "mojo/public/cpp/bindings/lib/interface_endpoint_client.h"
|
|
|
| namespace mojo {
|
| @@ -284,6 +285,17 @@ void MultiplexRouter::RaiseError() {
|
| }
|
| }
|
|
|
| +scoped_ptr<AssociatedGroup> MultiplexRouter::CreateAssociatedGroup() {
|
| + scoped_ptr<AssociatedGroup> group(new AssociatedGroup);
|
| + group->router_ = this;
|
| + return group.Pass();
|
| +}
|
| +
|
| +// static
|
| +MultiplexRouter* MultiplexRouter::GetRouter(AssociatedGroup* associated_group) {
|
| + return associated_group->router_.get();
|
| +}
|
| +
|
| ScopedMessagePipeHandle MultiplexRouter::PassMessagePipe() {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| {
|
|
|