diff options
| author | yzshen <yzshen@chromium.org> | 2016-02-12 06:46:56 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-12 14:48:20 +0000 |
| commit | ed928add8e2a58c3fcdfbf67bf7fbfa8d0143bc9 (patch) | |
| tree | 54a5793416db1c9cc4a81a65d133ec96d064a833 /mash | |
| parent | 30f19bc971d4442b5fdd247a3cb7b6b2a0419af1 (diff) | |
| download | chromium_src-ed928add8e2a58c3fcdfbf67bf7fbfa8d0143bc9.zip chromium_src-ed928add8e2a58c3fcdfbf67bf7fbfa8d0143bc9.tar.gz chromium_src-ed928add8e2a58c3fcdfbf67bf7fbfa8d0143bc9.tar.bz2 | |
Move two files into mojo/public/cpp/bindings.
They are:
- weak_binding_set.h
- weak_interface_ptr_set.h
BUG=None
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_site_isolation
Review URL: https://codereview.chromium.org/1692783002
Cr-Commit-Position: refs/heads/master@{#375180}
Diffstat (limited to 'mash')
| -rw-r--r-- | mash/screenlock/screenlock.h | 2 | ||||
| -rw-r--r-- | mash/shell/shell_application_delegate.h | 4 | ||||
| -rw-r--r-- | mash/wm/accelerator_registrar_impl.h | 2 | ||||
| -rw-r--r-- | mash/wm/window_manager_application.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/mash/screenlock/screenlock.h b/mash/screenlock/screenlock.h index 3d6bfb6..60c8999 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/common/weak_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" diff --git a/mash/shell/shell_application_delegate.h b/mash/shell/shell_application_delegate.h index b8cb184..89ddbda 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/common/weak_binding_set.h" -#include "mojo/common/weak_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" diff --git a/mash/wm/accelerator_registrar_impl.h b/mash/wm/accelerator_registrar_impl.h index 94a16c2..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/common/weak_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 f5ef9e1..d8356f7 100644 --- a/mash/wm/window_manager_application.h +++ b/mash/wm/window_manager_application.h @@ -18,8 +18,8 @@ #include "components/mus/public/interfaces/window_manager_factory.mojom.h" #include "components/mus/public/interfaces/window_tree_host.mojom.h" #include "mash/wm/public/interfaces/user_window_controller.mojom.h" -#include "mojo/common/weak_binding_set.h" #include "mojo/public/cpp/bindings/binding.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" |