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

remove chrome check and change protocol handler

Browse source
This commit is contained in:
Shelley Vohr 2017-10-07 00:36:18 -04:00
parent a1347f67a1
commit 66827755e7
No known key found for this signature in database
GPG key ID: F13993A75599653C
1 changed files with 20 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
atom/browser/browser_linux.cc
View file

@ -40,14 +40,11 @@ bool LaunchXdgUtility(const std::vector<std::string>& argv, int* exit_code) {
base::Process process = base::LaunchProcess(argv, options); base::Process process = base::LaunchProcess(argv, options);
close(devnull); close(devnull);
if (!process.IsValid())return false; if (!process.IsValid()) return false;
return process.WaitForExit(exit_code); return process.WaitForExit(exit_code);
} }
bool SetDefaultWebClient(const std::string& protocol) { bool SetDefaultWebClient(const std::string& protocol) {
#if defined(OS_CHROMEOS)
return true;
#else
std::unique_ptr<base::Environment> env(base::Environment::Create()); std::unique_ptr<base::Environment> env(base::Environment::Create());
std::vector<std::string> argv; std::vector<std::string> argv;
@ -62,7 +59,6 @@ bool SetDefaultWebClient(const std::string& protocol) {
int exit_code; int exit_code;
bool ran_ok = LaunchXdgUtility(argv, &exit_code); bool ran_ok = LaunchXdgUtility(argv, &exit_code);
return ran_ok && exit_code == EXIT_SUCCESS; return ran_ok && exit_code == EXIT_SUCCESS;
#endif
} }
void Browser::Focus() { void Browser::Focus() {
@ -90,35 +86,30 @@ bool Browser::SetAsDefaultProtocolClient(const std::string& protocol,
} }
bool Browser::IsDefaultProtocolClient(const std::string& protocol, bool Browser::IsDefaultProtocolClient(const std::string& protocol,
mate::Arguments* args) { mate::Arguments* args) {
#if defined(OS_CHROMEOS) base::ThreadRestrictions::AssertIOAllowed();
return UNKNOWN_DEFAULT; std::unique_ptr<base::Environment> env(base::Environment::Create());
#else
base::ThreadRestrictions::AssertIOAllowed();
std::unique_ptr<base::Environment> env(base::Environment::Create()); if (protocol.empty()) return false;
std::vector<std::string> argv; std::vector<std::string> argv;
argv.push_back(kXdgSettings); argv.push_back(kXdgSettings);
argv.push_back("check"); argv.push_back("check");
if (!protocol.empty()) { argv.push_back(kXdgSettingsDefaultSchemeHandler);
argv.push_back(kXdgSettingsDefaultSchemeHandler); argv.push_back(protocol);
argv.push_back(protocol); argv.push_back(libgtkui::GetDesktopName(env.get()));
}
argv.push_back(libgtkui::GetDesktopName(env.get()));
std::string reply; std::string reply;
int success_code; int success_code;
bool ran_ok = base::GetAppOutputWithExitCode(base::CommandLine(argv), bool ran_ok = base::GetAppOutputWithExitCode(base::CommandLine(argv),
&reply, &success_code); &reply, &success_code);
if (!ran_ok || success_code != EXIT_SUCCESS) return false; if (!ran_ok || success_code != EXIT_SUCCESS) return false;
// Allow any reply that starts with "yes". // Allow any reply that starts with "yes".
return base::StartsWith(reply, "yes", base::CompareCase::SENSITIVE) return base::StartsWith(reply, "yes", base::CompareCase::SENSITIVE)
? true ? true
: false; : false;
#endif
} }
// Todo implement // Todo implement