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

Unified Diff: chrome/browser/chrome_browser_main.cc

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/chrome_browser_main.h ('k') | chrome/browser/chrome_webusb_browser_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_browser_main.cc
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index a93e7fc9b0ab471f5568e8b38c206742dc1db617..d854cacf876246588070cb346e1d7c1356aba497 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -257,8 +257,7 @@
#endif // defined(USE_AURA)
#if !defined(OS_ANDROID)
-#include "chrome/browser/chrome_webusb_browser_client.h"
-#include "components/webusb/webusb_detector.h"
+#include "chrome/browser/usb/web_usb_detector.h"
#endif
#if defined(MOJO_SHELL_CLIENT)
@@ -1366,9 +1365,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableExperimentalWebPlatformFeatures) &&
base::FeatureList::IsEnabled(features::kWebUsb)) {
- webusb_browser_client_.reset(new ChromeWebUsbBrowserClient());
- webusb_detector_.reset(
- new webusb::WebUsbDetector(webusb_browser_client_.get()));
+ web_usb_detector_.reset(new WebUsbDetector());
}
#endif
@@ -1971,8 +1968,7 @@ void ChromeBrowserMainParts::PostMainMessageLoopRun() {
// shut down.
process_power_collector_.reset();
- webusb_detector_.reset();
- webusb_browser_client_.reset();
+ web_usb_detector_.reset();
for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
chrome_extra_parts_[i]->PostMainMessageLoopRun();
« no previous file with comments | « chrome/browser/chrome_browser_main.h ('k') | chrome/browser/chrome_webusb_browser_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698