| Index: chrome/app/mash/mash_runner.cc
|
| diff --git a/chrome/app/mash/mash_runner.cc b/chrome/app/mash/mash_runner.cc
|
| index c49780cd5d2342416d9750e714e60bfebf6f5098..c8804d3a3e694887677d47433e6d0277eaad10a8 100644
|
| --- a/chrome/app/mash/mash_runner.cc
|
| +++ b/chrome/app/mash/mash_runner.cc
|
| @@ -20,7 +20,7 @@
|
| #include "mash/shell/shell_application_delegate.h"
|
| #include "mash/wm/window_manager_application.h"
|
| #include "mojo/common/mojo_scheme_register.h"
|
| -#include "mojo/public/cpp/bindings/weak_binding_set.h"
|
| +#include "mojo/public/cpp/bindings/binding_set.h"
|
| #include "mojo/shell/background/background_shell.h"
|
| #include "mojo/shell/identity.h"
|
| #include "mojo/shell/native_runner_delegate.h"
|
| @@ -105,7 +105,7 @@ class DefaultShellClient : public mojo::ShellClient,
|
| return nullptr;
|
| }
|
|
|
| - mojo::WeakBindingSet<ShellClientFactory> shell_client_factory_bindings_;
|
| + mojo::BindingSet<ShellClientFactory> shell_client_factory_bindings_;
|
| scoped_ptr<mojo::ShellClient> shell_client_;
|
| scoped_ptr<mojo::ShellConnection> shell_connection_;
|
|
|
|
|