diff options
| author | yzshen <yzshen@chromium.org> | 2016-02-24 13:50:57 -0800 |
|---|---|---|
| committer | yzshen <yzshen@chromium.org> | 2016-02-24 21:54:19 +0000 |
| commit | f149001affd37322304216b7963f9cfa0b23063a (patch) | |
| tree | 0099984f51ab1e702371b1c44c0a90ecfdb8a54d /mash | |
| parent | 8d568b12722f02dbb2ec358ce4600b96a673c481 (diff) | |
| download | chromium_src-f149001affd37322304216b7963f9cfa0b23063a.zip chromium_src-f149001affd37322304216b7963f9cfa0b23063a.tar.gz chromium_src-f149001affd37322304216b7963f9cfa0b23063a.tar.bz2 | |
Revert "Rename WeakBindingSet/WeakInterfacePtrSet to BindingSet/InterfacePtrSet."
This reverts commit 632d319842096e6998d174e2f251865979ce2b72.
TBR=jam@chromium.org
BUG=
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_site_isolation
Review URL: https://codereview.chromium.org/1734803002 .
Cr-Commit-Position: refs/heads/master@{#377393}
Diffstat (limited to 'mash')
| -rw-r--r-- | mash/screenlock/screenlock.h | 4 | ||||
| -rw-r--r-- | mash/shell/shell_application_delegate.h | 9 | ||||
| -rw-r--r-- | mash/wm/accelerator_registrar_impl.h | 2 | ||||
| -rw-r--r-- | mash/wm/window_manager_application.h | 4 |
4 files changed, 10 insertions, 9 deletions
diff --git a/mash/screenlock/screenlock.h b/mash/screenlock/screenlock.h index e05a46c..07f9de5 100644 --- a/mash/screenlock/screenlock.h +++ b/mash/screenlock/screenlock.h @@ -10,7 +10,7 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "mash/shell/public/interfaces/shell.mojom.h" -#include "mojo/public/cpp/bindings/binding_set.h" +#include "mojo/public/cpp/bindings/weak_binding_set.h" #include "mojo/services/tracing/public/cpp/tracing_impl.h" #include "mojo/shell/public/cpp/shell_client.h" @@ -38,7 +38,7 @@ class Screenlock : public mojo::ShellClient, mojo::Shell* shell_; mojo::TracingImpl tracing_; scoped_ptr<views::AuraInit> aura_init_; - mojo::BindingSet<mash::shell::mojom::ScreenlockStateListener> bindings_; + mojo::WeakBindingSet<mash::shell::mojom::ScreenlockStateListener> bindings_; DISALLOW_COPY_AND_ASSIGN(Screenlock); }; diff --git a/mash/shell/shell_application_delegate.h b/mash/shell/shell_application_delegate.h index 524a554..60a1d69 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/binding_set.h" -#include "mojo/public/cpp/bindings/interface_ptr_set.h" +#include "mojo/public/cpp/bindings/weak_binding_set.h" +#include "mojo/public/cpp/bindings/weak_interface_ptr_set.h" #include "mojo/shell/public/cpp/interface_factory.h" #include "mojo/shell/public/cpp/shell_client.h" @@ -63,8 +63,9 @@ class ShellApplicationDelegate mojo::Shell* shell_; std::map<std::string, scoped_ptr<mojo::Connection>> connections_; bool screen_locked_; - mojo::BindingSet<mash::shell::mojom::Shell> bindings_; - mojo::InterfacePtrSet<mojom::ScreenlockStateListener> screenlock_listeners_; + mojo::WeakBindingSet<mash::shell::mojom::Shell> bindings_; + mojo::WeakInterfacePtrSet<mojom::ScreenlockStateListener> + screenlock_listeners_; DISALLOW_COPY_AND_ASSIGN(ShellApplicationDelegate); }; diff --git a/mash/wm/accelerator_registrar_impl.h b/mash/wm/accelerator_registrar_impl.h index 3bde90f..fe470c6 100644 --- a/mash/wm/accelerator_registrar_impl.h +++ b/mash/wm/accelerator_registrar_impl.h @@ -13,8 +13,8 @@ #include "base/macros.h" #include "components/mus/public/interfaces/accelerator_registrar.mojom.h" #include "mash/wm/root_windows_observer.h" -#include "mojo/public/cpp/bindings/binding_set.h" #include "mojo/public/cpp/bindings/strong_binding.h" +#include "mojo/public/cpp/bindings/weak_binding_set.h" namespace mash { namespace wm { diff --git a/mash/wm/window_manager_application.h b/mash/wm/window_manager_application.h index 7f2806f..7699b9f 100644 --- a/mash/wm/window_manager_application.h +++ b/mash/wm/window_manager_application.h @@ -19,7 +19,7 @@ #include "components/mus/public/interfaces/window_tree_host.mojom.h" #include "mash/wm/public/interfaces/user_window_controller.mojom.h" #include "mojo/public/cpp/bindings/binding.h" -#include "mojo/public/cpp/bindings/binding_set.h" +#include "mojo/public/cpp/bindings/weak_binding_set.h" #include "mojo/services/tracing/public/cpp/tracing_impl.h" #include "mojo/shell/public/cpp/shell_client.h" @@ -107,7 +107,7 @@ class WindowManagerApplication // |user_window_controller_| is created once OnEmbed() is called. Until that // time |user_window_controller_requests_| stores pending interface requests. scoped_ptr<UserWindowControllerImpl> user_window_controller_; - mojo::BindingSet<mash::wm::mojom::UserWindowController> + mojo::WeakBindingSet<mash::wm::mojom::UserWindowController> user_window_controller_binding_; std::vector< scoped_ptr<mojo::InterfaceRequest<mash::wm::mojom::UserWindowController>>> |