chrome/browser/storage_monitor/portable_device_watcher_win.cc - Issue 120983002: Update some uses of UTF conversions in chrome/browser to use the base:: namespace.

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/storage_monitor/portable_device_watcher_win.cc

Issue 120983002: Update some uses of UTF conversions in chrome/browser to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years 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/storage_monitor/media_transfer_protocol_device_observer_linux_unittest.cc ('k') | chrome/browser/storage_monitor/storage_monitor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/storage_monitor/portable_device_watcher_win.cc

diff --git a/chrome/browser/storage_monitor/portable_device_watcher_win.cc b/chrome/browser/storage_monitor/portable_device_watcher_win.cc

index 0efc31996d0cc0927836869bc1022dad2bf57160..bef912d2cc052cba9f6c042a7c9cc2f6f4170526 100644

--- a/chrome/browser/storage_monitor/portable_device_watcher_win.cc

+++ b/chrome/browser/storage_monitor/portable_device_watcher_win.cc

@@ -250,7 +250,7 @@ bool ConstructDeviceStorageUniqueId(const base::string16& device_serial_num,

DCHECK(device_storage_id);

*device_storage_id = StorageInfo::MakeDeviceId(

StorageInfo::MTP_OR_PTP,

- UTF16ToUTF8(storage_id + L':' + device_serial_num));

+ base::UTF16ToUTF8(storage_id + L':' + device_serial_num));

return true;

}

@@ -542,7 +542,7 @@ base::string16 PortableDeviceWatcherWin::GetStoragePathFromStorageId(

// Construct a dummy device path using the storage name. This is only used

// for registering the device media file system.

DCHECK(!storage_unique_id.empty());

- return UTF8ToUTF16("\\\\" + storage_unique_id);

+ return base::UTF8ToUTF16("\\\\" + storage_unique_id);

}

void PortableDeviceWatcherWin::SetNotifications(