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

Unified Diff: device/usb/usb_device_filter.cc

Issue 497363004: Merge components/usb_service into device/usb. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased. Created 6 years, 3 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 | « device/usb/usb_device_filter.h ('k') | device/usb/usb_device_filter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/usb/usb_device_filter.cc
diff --git a/components/usb_service/usb_device_filter.cc b/device/usb/usb_device_filter.cc
similarity index 94%
rename from components/usb_service/usb_device_filter.cc
rename to device/usb/usb_device_filter.cc
index d026fa054d30fbb016653e87e8749eb071c5a301..cc919e2d00e5928f7325bff730f71ff7fac173c1 100644
--- a/components/usb_service/usb_device_filter.cc
+++ b/device/usb/usb_device_filter.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "components/usb_service/usb_device_filter.h"
+#include "device/usb/usb_device_filter.h"
#include "base/values.h"
-#include "components/usb_service/usb_device.h"
-#include "components/usb_service/usb_interface.h"
+#include "device/usb/usb_device.h"
+#include "device/usb/usb_interface.h"
-namespace usb_service {
+namespace device {
namespace {
@@ -137,4 +137,4 @@ bool UsbDeviceFilter::MatchesAny(scoped_refptr<UsbDevice> device,
return false;
}
-} // namespace usb_service
+} // namespace device
« no previous file with comments | « device/usb/usb_device_filter.h ('k') | device/usb/usb_device_filter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698