diff options
Diffstat (limited to 'mojo/shell/application_manager.h')
| -rw-r--r-- | mojo/shell/application_manager.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mojo/shell/application_manager.h b/mojo/shell/application_manager.h index b6e657c..16e9ab4 100644 --- a/mojo/shell/application_manager.h +++ b/mojo/shell/application_manager.h @@ -11,8 +11,8 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.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/services/package_manager/public/interfaces/shell_resolver.mojom.h" #include "mojo/shell/application_loader.h" #include "mojo/shell/capability_filter.h" @@ -181,14 +181,14 @@ class ApplicationManager : public ShellClient, // Counter used to assign ids to content handlers. uint32_t shell_client_factory_id_counter_; - WeakInterfacePtrSet<mojom::ApplicationManagerListener> listeners_; + InterfacePtrSet<mojom::ApplicationManagerListener> listeners_; base::Callback<void(const Identity&)> instance_quit_callback_; base::TaskRunner* file_task_runner_; scoped_ptr<NativeRunnerFactory> native_runner_factory_; std::vector<scoped_ptr<NativeRunner>> native_runners_; scoped_ptr<ShellConnection> shell_connection_; - WeakBindingSet<mojom::ApplicationManager> bindings_; + BindingSet<mojom::ApplicationManager> bindings_; base::WeakPtrFactory<ApplicationManager> weak_ptr_factory_; DISALLOW_COPY_AND_ASSIGN(ApplicationManager); |