Index: mash/shell/shell_application_delegate.h |
diff --git a/mash/shell/shell_application_delegate.h b/mash/shell/shell_application_delegate.h |
index 60a1d69b93b7be481362d1a5ce8481168963ff7a..524a554a0e6ab2e7a109b9657b8e2c905f58431b 100644 |
--- a/mash/shell/shell_application_delegate.h |
+++ b/mash/shell/shell_application_delegate.h |
@@ -11,8 +11,8 @@ |
#include "base/macros.h" |
#include "base/memory/scoped_ptr.h" |
#include "mash/shell/public/interfaces/shell.mojom.h" |
-#include "mojo/public/cpp/bindings/weak_binding_set.h" |
-#include "mojo/public/cpp/bindings/weak_interface_ptr_set.h" |
+#include "mojo/public/cpp/bindings/binding_set.h" |
+#include "mojo/public/cpp/bindings/interface_ptr_set.h" |
#include "mojo/shell/public/cpp/interface_factory.h" |
#include "mojo/shell/public/cpp/shell_client.h" |
@@ -63,9 +63,8 @@ class ShellApplicationDelegate |
mojo::Shell* shell_; |
std::map<std::string, scoped_ptr<mojo::Connection>> connections_; |
bool screen_locked_; |
- mojo::WeakBindingSet<mash::shell::mojom::Shell> bindings_; |
- mojo::WeakInterfacePtrSet<mojom::ScreenlockStateListener> |
- screenlock_listeners_; |
+ mojo::BindingSet<mash::shell::mojom::Shell> bindings_; |
+ mojo::InterfacePtrSet<mojom::ScreenlockStateListener> screenlock_listeners_; |
DISALLOW_COPY_AND_ASSIGN(ShellApplicationDelegate); |
}; |