mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use base::string16 and base::JoinString instead of custom methods

Browse source
This commit is contained in:
Samuel Attard 2016-08-18 20:35:57 +10:00
parent ca971e978e
commit 73246112d2
No known key found for this signature in database
GPG key ID: 273DC1869D8F13EF
1 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
atom/browser/browser_win.cc
View file

@ -21,6 +21,7 @@
#include "base/win/registry.h" #include "base/win/registry.h"
#include "base/win/windows_version.h" #include "base/win/windows_version.h"
#include "atom/common/atom_version.h" #include "atom/common/atom_version.h"
#include "atom/common/native_mate_converters/string16_converter.h"
namespace atom { namespace atom {
@ -125,38 +126,31 @@ bool Browser::SetUserTasks(const std::vector<UserTask>& tasks) {
return SUCCEEDED(destinations->CommitList()); return SUCCEEDED(destinations->CommitList());
} }
bool GetProtocolLaunchPath(std::string protocol, mate::Arguments* args, std::wstring* exe) { bool GetProtocolLaunchPath(mate::Arguments* args, base::string16* exe) {
// Read in optional exe path arg // Read in optional exe path arg
std::wstring exePath; base::string16 exePath;
std::string rawExePath;
base::FilePath path; base::FilePath path;
if (!args->GetNext(&rawExePath)) { if (!args->GetNext(&exePath)) {
if (!PathService::Get(base::FILE_EXE, &path)) { if (!PathService::Get(base::FILE_EXE, &path)) {
LOG(ERROR) << "Error getting app exe path"; LOG(ERROR) << "Error getting app exe path";
return false; return false;
} }
// Executable Path // Executable Path
exePath = path.value(); exePath = path.value();
} else {
exePath.assign(rawExePath.begin(), rawExePath.end());
} }
// Read in optional args arg // Read in optional args arg
std::vector<std::string> launchArgs; std::vector<base::string16> launchArgs;
args->GetNext(&launchArgs); args->GetNext(&launchArgs);
*exe = L"\"" + exePath + L"\" ";
// Parse launch args into a string of space spearated args // Parse launch args into a string of space spearated args
base::string16 launchArgString;
if (launchArgs.size() != 0) { if (launchArgs.size() != 0) {
std::string launchArgString = base::JoinString(launchArgs, " "); launchArgString = base::JoinString(launchArgs, L" ");
std::wstring wLaunchArgString;
wLaunchArgString.assign(launchArgString.begin(), launchArgString.end());
*exe = *exe + L"\"" + wLaunchArgString + L"\"";
} }
*exe = *exe + L"\"%1\""; *exe = base::StringPrintf(L"\"%s\" %s \"%%1\"", exePath.c_str(), launchArgString.c_str());
return true; return true;
} }
@ -190,7 +184,7 @@ bool Browser::RemoveAsDefaultProtocolClient(const std::string& protocol,
return true; return true;
std::wstring exe; std::wstring exe;
if (!GetProtocolLaunchPath(protocol, args, &exe)) { if (!GetProtocolLaunchPath(args, &exe)) {
return false; return false;
} }
if (exe == L"") if (exe == L"")
@ -226,7 +220,7 @@ bool Browser::SetAsDefaultProtocolClient(const std::string& protocol,
return false; return false;
std::wstring exe; std::wstring exe;
if (!GetProtocolLaunchPath(protocol, args, &exe)) { if (!GetProtocolLaunchPath(args, &exe)) {
return false; return false;
} }
@ -260,7 +254,7 @@ bool Browser::IsDefaultProtocolClient(const std::string& protocol,
return false; return false;
std::wstring exe; std::wstring exe;
if (!GetProtocolLaunchPath(protocol, args, &exe)) { if (!GetProtocolLaunchPath(args, &exe)) {
return false; return false;
} }