chrome/browser/devtools/adb/android_usb_device.cc - Issue 176843022: Move UTF16ToASCII, remove WideToASCII.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/devtools/adb/android_usb_device.cc

Issue 176843022: Move UTF16ToASCII, remove WideToASCII. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 9 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:

Index: chrome/browser/devtools/adb/android_usb_device.cc

diff --git a/chrome/browser/devtools/adb/android_usb_device.cc b/chrome/browser/devtools/adb/android_usb_device.cc

index e5b5ab8ca9b103fde857b914ecf09093a5404655..c383a7d14714180bd538ce58a5e8f860e212c5d9 100644

--- a/chrome/browser/devtools/adb/android_usb_device.cc

+++ b/chrome/browser/devtools/adb/android_usb_device.cc

@@ -13,6 +13,7 @@

#include "base/stl_util.h"

#include "base/strings/string_util.h"

#include "base/strings/stringprintf.h"

+#include "base/strings/utf_string_conversions.h"

#include "chrome/browser/devtools/adb/android_rsa.h"

#include "chrome/browser/devtools/adb/android_usb_socket.h"

#include "chrome/browser/usb/usb_device.h"

@@ -98,7 +99,7 @@ scoped_refptr<AndroidUsbDevice> ClaimInterface(

if (!usb_handle->GetSerial(&serial) || serial.empty())

return NULL;

- return new AndroidUsbDevice(rsa_key, usb_handle, UTF16ToASCII(serial),

+ return new AndroidUsbDevice(rsa_key, usb_handle, base::UTF16ToASCII(serial),

inbound_address, outbound_address, zero_mask);

}