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

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

Issue 2146663002: Move //components/webusb/ to //chrome/browser/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merged web_usb_browser_client.* to web_usb_detector.* Created 4 years, 5 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
« no previous file with comments | « chrome/browser/usb/OWNERS ('k') | chrome/browser/usb/web_usb_detector.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/usb/web_usb_detector.h
diff --git a/components/webusb/webusb_detector.h b/chrome/browser/usb/web_usb_detector.h
similarity index 64%
rename from components/webusb/webusb_detector.h
rename to chrome/browser/usb/web_usb_detector.h
index cbf5a62ebf6ac8e45cda81ec364e9ff76f1eed2b..6d8e0989bd019a145d849996579f0e8777f4485f 100644
--- a/components/webusb/webusb_detector.h
+++ b/chrome/browser/usb/web_usb_detector.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef COMPONENTS_WEBUSB_WEBUSB_DETECTOR_H_
-#define COMPONENTS_WEBUSB_WEBUSB_DETECTOR_H_
+#ifndef CHROME_BROWSER_USB_WEB_USB_DETECTOR_H_
+#define CHROME_BROWSER_USB_WEB_USB_DETECTOR_H_
#include "base/macros.h"
#include "base/scoped_observer.h"
@@ -13,34 +13,24 @@ namespace device {
class UsbDevice;
}
-namespace webusb {
-
class UsbDevice;
-class WebUsbBrowserClient;
class WebUsbDetector : public device::UsbService::Observer {
public:
- explicit WebUsbDetector(WebUsbBrowserClient* webusb_browser_client);
-
+ WebUsbDetector();
~WebUsbDetector() override;
private:
// Initializes the WebUsbDetector.
void Initialize();
- // UsbService::observer override:
+ // device::UsbService::observer:
void OnDeviceAdded(scoped_refptr<device::UsbDevice> device) override;
-
- // UsbService::observer override:
void OnDeviceRemoved(scoped_refptr<device::UsbDevice> device) override;
- WebUsbBrowserClient* webusb_browser_client_ = nullptr;
-
ScopedObserver<device::UsbService, device::UsbService::Observer> observer_;
DISALLOW_COPY_AND_ASSIGN(WebUsbDetector);
};
-} // namespace webusb
-
-#endif // COMPONENTS_WEBUSB_WEBUSB_DETECTOR_H_
+#endif // CHROME_BROWSER_USB_WEB_USB_DETECTOR_H_
« no previous file with comments | « chrome/browser/usb/OWNERS ('k') | chrome/browser/usb/web_usb_detector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698