| 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 e237aeff7310a8d5cdcc5cee985fe19c64d338ee..b4410840d5fc6f0192a00f7252af7d7aa19a282a 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.Pass();
|
| - 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.Pass();
|
| + delegate_->Initialize(this);
|
| +}
|
| +
|
| void ApplicationImpl::BindShell(ScopedMessagePipeHandle shell_handle) {
|
| shell_watch_ = new ShellPtrWatcher(this);
|
| shell_.Bind(shell_handle.Pass());
|
|
|