chrome/browser/storage_monitor/storage_monitor_mac.mm - 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/storage_monitor_mac.mm

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/storage_monitor_linux_unittest.cc ('k') | chrome/browser/storage_monitor/storage_monitor_mac_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/storage_monitor/storage_monitor_mac.mm

diff --git a/chrome/browser/storage_monitor/storage_monitor_mac.mm b/chrome/browser/storage_monitor/storage_monitor_mac.mm

index 1ea52aa5cf132e75d5a9152fa297ad95c0f34da0..16ea943c76b7311f511edbfff22212ebf180898f 100644

--- a/chrome/browser/storage_monitor/storage_monitor_mac.mm

+++ b/chrome/browser/storage_monitor/storage_monitor_mac.mm

@@ -85,7 +85,7 @@ StorageInfo BuildStorageInfo(

base::string16 unique_id2 = vendor;

unique_id2 = JoinName(unique_id2, model);

unique_id2 = JoinName(unique_id2, revision);

- unique_id = UTF16ToUTF8(unique_id2);

+ unique_id = base::UTF16ToUTF8(unique_id2);

}

CFBooleanRef is_removable_ref =

@@ -365,7 +365,7 @@ bool StorageMonitorMac::ShouldPostNotificationForDisk(

// are removable. Also exclude disk images (DMGs).

return !info.device_id().empty() &&

!info.location().empty() &&

- info.model_name() != ASCIIToUTF16(kDiskImageModelName) &&

+ info.model_name() != base::ASCIIToUTF16(kDiskImageModelName) &&

StorageInfo::IsMassStorageDevice(info.device_id());

}