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

Unified Diff: content/common/handle_enumerator_win.cc

Issue 102593002: Convert string16 to base::string16 in content. (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 | « content/common/handle_enumerator_win.h ('k') | content/common/indexed_db/indexed_db_key.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/handle_enumerator_win.cc
diff --git a/content/common/handle_enumerator_win.cc b/content/common/handle_enumerator_win.cc
index 4482d5bb31cd79b17576d5732496d83c9c8af432..7cda767294f27e5c3c0c2bdec1e714aa6a98e8e1 100644
--- a/content/common/handle_enumerator_win.cc
+++ b/content/common/handle_enumerator_win.cc
@@ -19,7 +19,7 @@
namespace content {
namespace {
-typedef std::map<const string16, HandleType> HandleTypeMap;
+typedef std::map<const base::string16, HandleType> HandleTypeMap;
HandleTypeMap& MakeHandleTypeMap() {
HandleTypeMap& handle_types = *(new HandleTypeMap());
@@ -52,7 +52,7 @@ void HandleEnumerator::EnumerateHandles() {
std::string process_type =
CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
switches::kProcessType);
- string16 output = ASCIIToUTF16(process_type);
+ base::string16 output = ASCIIToUTF16(process_type);
output.append(ASCIIToUTF16(" process - Handles at shutdown:\n"));
for (sandbox::HandleTable::Iterator sys_handle
= handles.HandlesForProcess(::GetCurrentProcessId());
@@ -78,15 +78,15 @@ void HandleEnumerator::EnumerateHandles() {
DVLOG(0) << output;
}
-HandleType StringToHandleType(const string16& type) {
+HandleType StringToHandleType(const base::string16& type) {
static HandleTypeMap handle_types = MakeHandleTypeMap();
HandleTypeMap::iterator result = handle_types.find(type);
return result != handle_types.end() ? result->second : OtherHandle;
}
-string16 GetAccessString(HandleType handle_type,
+base::string16 GetAccessString(HandleType handle_type,
ACCESS_MASK access) {
- string16 output;
+ base::string16 output;
if (access & GENERIC_READ)
output.append(ASCIIToUTF16("\tGENERIC_READ\n"));
if (access & GENERIC_WRITE)
« no previous file with comments | « content/common/handle_enumerator_win.h ('k') | content/common/indexed_db/indexed_db_key.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698