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 /chrome/browser | |
| 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 'chrome/browser')
| -rw-r--r-- | chrome/browser/chromeos/chrome_interface_factory.h | 4 | ||||
| -rw-r--r-- | chrome/browser/usb/web_usb_permission_bubble.h | 4 | ||||
| -rw-r--r-- | chrome/browser/usb/web_usb_permission_provider.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/chromeos/chrome_interface_factory.h b/chrome/browser/chromeos/chrome_interface_factory.h index 3a8f8f1..5b2da45 100644 --- a/chrome/browser/chromeos/chrome_interface_factory.h +++ b/chrome/browser/chromeos/chrome_interface_factory.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_CHROME_INTERFACE_FACTORY_H_ #include "content/public/common/mojo_shell_connection.h" -#include "mojo/public/cpp/bindings/binding_set.h" +#include "mojo/public/cpp/bindings/weak_binding_set.h" #include "mojo/shell/public/cpp/interface_factory.h" #include "ui/keyboard/keyboard.mojom.h" @@ -32,7 +32,7 @@ class ChromeInterfaceFactory mojo::InterfaceRequest<keyboard::mojom::Keyboard> request) override; scoped_ptr<KeyboardUIService> keyboard_ui_service_; - mojo::BindingSet<keyboard::mojom::Keyboard> keyboard_bindings_; + mojo::WeakBindingSet<keyboard::mojom::Keyboard> keyboard_bindings_; DISALLOW_COPY_AND_ASSIGN(ChromeInterfaceFactory); }; diff --git a/chrome/browser/usb/web_usb_permission_bubble.h b/chrome/browser/usb/web_usb_permission_bubble.h index d55ffc6..687f2c0 100644 --- a/chrome/browser/usb/web_usb_permission_bubble.h +++ b/chrome/browser/usb/web_usb_permission_bubble.h @@ -11,8 +11,8 @@ #include "components/bubble/bubble_reference.h" #include "components/webusb/public/interfaces/webusb_permission_bubble.mojom.h" #include "mojo/public/cpp/bindings/array.h" -#include "mojo/public/cpp/bindings/binding_set.h" #include "mojo/public/cpp/bindings/interface_request.h" +#include "mojo/public/cpp/bindings/weak_binding_set.h" namespace content { class RenderFrameHost; @@ -39,7 +39,7 @@ class ChromeWebUsbPermissionBubble : public webusb::WebUsbPermissionBubble { private: content::RenderFrameHost* const render_frame_host_; - mojo::BindingSet<webusb::WebUsbPermissionBubble> bindings_; + mojo::WeakBindingSet<webusb::WebUsbPermissionBubble> bindings_; std::vector<BubbleReference> bubbles_; DISALLOW_COPY_AND_ASSIGN(ChromeWebUsbPermissionBubble); diff --git a/chrome/browser/usb/web_usb_permission_provider.h b/chrome/browser/usb/web_usb_permission_provider.h index 19b6f30..a85d16a 100644 --- a/chrome/browser/usb/web_usb_permission_provider.h +++ b/chrome/browser/usb/web_usb_permission_provider.h @@ -9,8 +9,8 @@ #include "device/usb/public/interfaces/permission_provider.mojom.h" #include "mojo/public/cpp/bindings/array.h" -#include "mojo/public/cpp/bindings/binding_set.h" #include "mojo/public/cpp/bindings/interface_request.h" +#include "mojo/public/cpp/bindings/weak_binding_set.h" namespace content { class RenderFrameHost; @@ -44,7 +44,7 @@ class WebUSBPermissionProvider : public device::usb::PermissionProvider { mojo::InterfaceRequest<device::usb::PermissionProvider> request) override; private: - mojo::BindingSet<PermissionProvider> bindings_; + mojo::WeakBindingSet<PermissionProvider> bindings_; content::RenderFrameHost* const render_frame_host_; }; |