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

Unified Diff: remoting/host/setup/daemon_controller_delegate_win.cc

Issue 121123002: Update uses of UTF conversions in ppapi/, printing/, remoting/, rlz/, sandbox/, skia/, sql/, sync/,… (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 | « remoting/host/policy_hack/policy_watcher_win.cc ('k') | remoting/host/setup/daemon_installer_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/setup/daemon_controller_delegate_win.cc
diff --git a/remoting/host/setup/daemon_controller_delegate_win.cc b/remoting/host/setup/daemon_controller_delegate_win.cc
index 74f5846d896933ea5e69f6cd3112d96d8ff8c8c7..2070c49a124146be5da49bac30de6ff2e55e6a54 100644
--- a/remoting/host/setup/daemon_controller_delegate_win.cc
+++ b/remoting/host/setup/daemon_controller_delegate_win.cc
@@ -58,7 +58,7 @@ const int kUnprivilegedTimeoutSec = 60;
void ConfigToString(const base::DictionaryValue& config, ScopedBstr* out) {
std::string config_str;
base::JSONWriter::Write(&config, &config_str);
- ScopedBstr config_scoped_bstr(UTF8ToUTF16(config_str).c_str());
+ ScopedBstr config_scoped_bstr(base::UTF8ToUTF16(config_str).c_str());
out->Swap(config_scoped_bstr);
}
@@ -183,7 +183,7 @@ scoped_ptr<base::DictionaryValue> DaemonControllerDelegateWin::GetConfig() {
base::string16 file_content(
static_cast<BSTR>(host_config), host_config.Length());
scoped_ptr<base::Value> config(
- base::JSONReader::Read(UTF16ToUTF8(file_content),
+ base::JSONReader::Read(base::UTF16ToUTF8(file_content),
base::JSON_ALLOW_TRAILING_COMMAS));
if (!config || config->GetType() != base::Value::TYPE_DICTIONARY)
@@ -278,7 +278,7 @@ std::string DaemonControllerDelegateWin::GetVersion() {
if (FAILED(hr))
return std::string();
- return UTF16ToUTF8(
+ return base::UTF16ToUTF8(
base::string16(static_cast<BSTR>(version), version.Length()));
}
« no previous file with comments | « remoting/host/policy_hack/policy_watcher_win.cc ('k') | remoting/host/setup/daemon_installer_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698