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

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

Issue 1724183005: Change ChooserBubbleDelegate class name to ChooserBubbleController (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merged changes from master, resolved conflicts and updated related files Created 4 years, 10 months 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
deleted file mode 100644
index 4921b0f2c4cdbcbd25dd537facc6878b088030f5..0000000000000000000000000000000000000000
--- a/chrome/browser/usb/usb_chooser_bubble_delegate.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_BROWSER_USB_USB_CHOOSER_BUBBLE_DELEGATE_H_
-#define CHROME_BROWSER_USB_USB_CHOOSER_BUBBLE_DELEGATE_H_
-
-#include <utility>
-
-#include "base/macros.h"
-#include "base/memory/ref_counted.h"
-#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"
-
-namespace content {
-class RenderFrameHost;
-}
-
-namespace device {
-class UsbDevice;
-class UsbDeviceFilter;
-}
-
-// UsbChooserBubbleDelegate creates a chooser bubble for WebUsb.
-class UsbChooserBubbleDelegate : public ChooserBubbleDelegate,
- public device::UsbService::Observer {
- public:
- UsbChooserBubbleDelegate(
- content::RenderFrameHost* owner,
- mojo::Array<device::usb::DeviceFilterPtr> device_filters,
- content::RenderFrameHost* render_frame_host,
- const webusb::WebUsbPermissionBubble::GetPermissionCallback& callback);
- ~UsbChooserBubbleDelegate() override;
-
- // ChooserBubbleDelegate:
- size_t NumOptions() const override;
- const base::string16& GetOption(size_t index) const override;
- void Select(size_t index) override;
- void Cancel() override;
- void Close() override;
- GURL GetHelpCenterUrl() const override;
-
- // device::UsbService::Observer:
- void OnDeviceAdded(scoped_refptr<device::UsbDevice> device) override;
- void OnDeviceRemoved(scoped_refptr<device::UsbDevice> device) override;
-
- 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_;
- ScopedObserver<device::UsbService, device::UsbService::Observer>
- usb_service_observer_;
- std::vector<device::UsbDeviceFilter> filters_;
- // Each pair is a (device, device name).
- std::vector<std::pair<scoped_refptr<device::UsbDevice>, base::string16>>
- devices_;
- BubbleReference bubble_controller_;
- base::WeakPtrFactory<UsbChooserBubbleDelegate> weak_factory_;
-
- DISALLOW_COPY_AND_ASSIGN(UsbChooserBubbleDelegate);
-};
-
-#endif // CHROME_BROWSER_USB_USB_CHOOSER_BUBBLE_DELEGATE_H_
« no previous file with comments | « chrome/browser/usb/usb_chooser_bubble_controller.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