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

Unified Diff: cloud_print/service/win/service_utils.cc

Issue 107383002: Use base namespace for string16 in components and cloud_print. (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 | « cloud_print/service/win/service_utils.h ('k') | cloud_print/service/win/setup_listener.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cloud_print/service/win/service_utils.cc
diff --git a/cloud_print/service/win/service_utils.cc b/cloud_print/service/win/service_utils.cc
index e63f2ab3d9a557d55dfdcc9e9fcdd86523f6f9ed..cb791ada7aa5e9b64afb6b57fbbc5be350cee046 100644
--- a/cloud_print/service/win/service_utils.cc
+++ b/cloud_print/service/win/service_utils.cc
@@ -12,20 +12,20 @@
#include "base/strings/string_util.h"
#include "chrome/common/chrome_switches.h"
-string16 GetLocalComputerName() {
+base::string16 GetLocalComputerName() {
DWORD size = 0;
- string16 result;
+ base::string16 result;
::GetComputerName(NULL, &size);
result.resize(size);
if (result.empty())
return result;
if (!::GetComputerName(&result[0], &size))
- return string16();
+ return base::string16();
result.resize(size);
return result;
}
-string16 ReplaceLocalHostInName(const string16& user_name) {
+base::string16 ReplaceLocalHostInName(const base::string16& user_name) {
static const wchar_t kLocalDomain[] = L".\\";
if (StartsWith(user_name, kLocalDomain, true)) {
return GetLocalComputerName() +
@@ -34,15 +34,15 @@ string16 ReplaceLocalHostInName(const string16& user_name) {
return user_name;
}
-string16 GetCurrentUserName() {
+base::string16 GetCurrentUserName() {
ULONG size = 0;
- string16 result;
+ base::string16 result;
::GetUserNameEx(::NameSamCompatible, NULL, &size);
result.resize(size);
if (result.empty())
return result;
if (!::GetUserNameEx(::NameSamCompatible, &result[0], &size))
- return string16();
+ return base::string16();
result.resize(size);
return result;
}
« no previous file with comments | « cloud_print/service/win/service_utils.h ('k') | cloud_print/service/win/setup_listener.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698