Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7192)

Unified Diff: chrome/browser/usb/usb_chooser_bubble_delegate.h

Issue 1530493002: Remove Close button for chooser bubble and call CloseBubble when Cancel (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use std::move instead of .Pass() Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/usb/usb_chooser_bubble_delegate.h
diff --git a/chrome/browser/usb/usb_chooser_bubble_delegate.h b/chrome/browser/usb/usb_chooser_bubble_delegate.h
index 9d06131ff2a7ecf4339d402e4c959ca6698805ef..6d47134195e5f60e0c9caa3133517368fa029786 100644
--- a/chrome/browser/usb/usb_chooser_bubble_delegate.h
+++ b/chrome/browser/usb/usb_chooser_bubble_delegate.h
@@ -10,6 +10,7 @@
#include "base/memory/weak_ptr.h"
#include "base/scoped_observer.h"
#include "chrome/browser/ui/website_settings/chooser_bubble_delegate.h"
+#include "components/bubble/bubble_reference.h"
#include "components/webusb/public/interfaces/webusb_permission_bubble.mojom.h"
#include "device/usb/usb_service.h"
#include "mojo/public/cpp/bindings/array.h"
@@ -49,6 +50,8 @@ class UsbChooserBubbleDelegate : public ChooserBubbleDelegate,
void GotUsbDeviceList(
const std::vector<scoped_refptr<device::UsbDevice>>& devices);
+ void set_bubble_controller(BubbleReference bubble_controller);
+
private:
content::RenderFrameHost* const render_frame_host_;
webusb::WebUsbPermissionBubble::GetPermissionCallback callback_;
@@ -57,6 +60,7 @@ class UsbChooserBubbleDelegate : public ChooserBubbleDelegate,
std::vector<device::UsbDeviceFilter> filters_;
std::vector<scoped_refptr<device::UsbDevice>> devices_;
std::vector<base::string16> devices_names_;
+ BubbleReference bubble_controller_;
base::WeakPtrFactory<UsbChooserBubbleDelegate> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(UsbChooserBubbleDelegate);
« no previous file with comments | « chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.cc ('k') | chrome/browser/usb/usb_chooser_bubble_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698