Chromium Code Reviews| Index: win8/delegate_execute/delegate_execute.cc |
| diff --git a/win8/delegate_execute/delegate_execute.cc b/win8/delegate_execute/delegate_execute.cc |
| index 249ad5be3ad620102e6cee6582a360506fa658b8..87de7800060d1b86ab5e9c6493ef5ff84cd0b428 100644 |
| --- a/win8/delegate_execute/delegate_execute.cc |
| +++ b/win8/delegate_execute/delegate_execute.cc |
| @@ -13,7 +13,6 @@ |
| #include "base/file_util.h" |
| #include "base/process_util.h" |
| #include "base/string16.h" |
| -#include "base/utf_string_conversions.h" |
| #include "base/win/scoped_com_initializer.h" |
| #include "base/win/scoped_handle.h" |
| #include "chrome/common/chrome_switches.h" |
| @@ -85,12 +84,11 @@ int RelaunchChrome(const DelegateExecuteOperation& operation) { |
| base::win::ScopedCOMInitializer com_initializer; |
| - string16 flags(ASCIIToWide(operation.relaunch_flags())); |
| SHELLEXECUTEINFO sei = { sizeof(sei) }; |
| sei.fMask = SEE_MASK_FLAG_LOG_USAGE; |
| sei.nShow = SW_SHOWNORMAL; |
| sei.lpFile = operation.shortcut().value().c_str(); |
| - sei.lpParameters = flags.c_str(); |
| + sei.lpParameters = operation.relaunch_flags().c_str(); |
|
cpu_(ooo_6.6-7.5)
2012/09/21 19:28:01
this is fine but note that my version is defensive
|
| AtlTrace(L"Relaunching Chrome via shortcut [%ls]\n", sei.lpFile); |