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

Unified Diff: remoting/host/plugin/daemon_installer_win.cc

Issue 10824166: Cleaned up usage of std::wstring in src/remoting. Added presubmit warning supressions for the reman… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 8 years, 4 months 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/host_event_logger_win.cc ('k') | remoting/host/policy_hack/policy_watcher_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/plugin/daemon_installer_win.cc
diff --git a/remoting/host/plugin/daemon_installer_win.cc b/remoting/host/plugin/daemon_installer_win.cc
index a5454321ede3c360f3d258f9d76b0961471b1cc8..606c1c8f13c76a269253e8c54dfec9decc1d25ad 100644
--- a/remoting/host/plugin/daemon_installer_win.cc
+++ b/remoting/host/plugin/daemon_installer_win.cc
@@ -285,24 +285,23 @@ void DaemonCommandLineInstallerWin::Install() {
return;
}
+ // presubmit: allow wstring
std::wstring google_update;
- result = update_key.ReadValue(kOmahaPathValueName,
- &google_update);
+ result = update_key.ReadValue(kOmahaPathValueName, &google_update);
if (result != ERROR_SUCCESS) {
Done(HRESULT_FROM_WIN32(result));
return;
}
// Launch the updater process and wait for its termination.
- std::wstring command_line =
+ string16 command_line = WideToUTF16(
StringPrintf(kGoogleUpdateCommandLineFormat,
google_update.c_str(),
kHostOmahaAppid,
- kOmahaLanguage);
+ kOmahaLanguage));
base::LaunchOptions options;
- if (!base::LaunchProcess(WideToUTF16(command_line), options,
- process_.Receive())) {
+ if (!base::LaunchProcess(command_line, options, process_.Receive())) {
result = GetLastError();
Done(HRESULT_FROM_WIN32(result));
return;
« no previous file with comments | « remoting/host/host_event_logger_win.cc ('k') | remoting/host/policy_hack/policy_watcher_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698