| Index: mojo/public/cpp/application/lib/application_impl.cc
|
| diff --git a/mojo/public/cpp/application/lib/application_impl.cc b/mojo/public/cpp/application/lib/application_impl.cc
|
| index 85218379b35d2c9d00070f7f4c839ece72b636f2..6a5560dd32b7cc0d10f5c1ab978159f1a6e68297 100644
|
| --- a/mojo/public/cpp/application/lib/application_impl.cc
|
| +++ b/mojo/public/cpp/application/lib/application_impl.cc
|
| @@ -54,13 +54,6 @@ ApplicationImpl::~ApplicationImpl() {
|
| delete shell_watch_;
|
| }
|
|
|
| -void ApplicationImpl::Initialize(Array<String> args) {
|
| - MOJO_CHECK(!initialized_);
|
| - initialized_ = true;
|
| - args_ = args.To<std::vector<std::string>>();
|
| - delegate_->Initialize(this);
|
| -}
|
| -
|
| ApplicationConnection* ApplicationImpl::ConnectToApplication(
|
| const String& application_url) {
|
| MOJO_CHECK(initialized_);
|
| @@ -84,6 +77,17 @@ bool ApplicationImpl::WaitForInitialize() {
|
| return result;
|
| }
|
|
|
| +ScopedMessagePipeHandle ApplicationImpl::UnbindShell() {
|
| + return shell_.PassMessagePipe();
|
| +}
|
| +
|
| +void ApplicationImpl::Initialize(Array<String> args) {
|
| + MOJO_CHECK(!initialized_);
|
| + initialized_ = true;
|
| + args_ = args.To<std::vector<std::string>>();
|
| + delegate_->Initialize(this);
|
| +}
|
| +
|
| void ApplicationImpl::BindShell(ScopedMessagePipeHandle shell_handle) {
|
| shell_watch_ = new ShellPtrWatcher(this);
|
| shell_.Bind(shell_handle.Pass());
|
|
|