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

add xdg helper method

Browse source
This commit is contained in:
Shelley Vohr 2017-10-03 11:10:38 -04:00
parent 3f73e000ee
commit 6131a523dc
No known key found for this signature in database
GPG key ID: F13993A75599653C
1 changed files with 49 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
atom/browser/browser_linux.cc
View file

@ -41,40 +41,15 @@ const char kXdgSettings[] = "xdg-settings";
const char kXdgSettingsDefaultBrowser[] = "default-web-browser"; const char kXdgSettingsDefaultBrowser[] = "default-web-browser";
const char kXdgSettingsDefaultSchemeHandler[] = "default-url-scheme-handler"; const char kXdgSettingsDefaultSchemeHandler[] = "default-url-scheme-handler";
// TODO(codebytere): handle/replace GetChromeVersionOfScript
bool Browser::SetAsDefaultProtocolClient(const std::string& protocol, bool Browser::SetAsDefaultProtocolClient(const std::string& protocol,
mate::Arguments* args) { mate::Arguments* args) {
#if defined(OS_CHROMEOS) return SetDefaultWebClient(protocol);
return true;
#else
std::unique_ptr<base::Environment> env(base::Environment::Create());
std::vector<std::string> argv;
argv.push_back(kXdgSettings);
argv.push_back("set");
if (protocol.empty()) {
argv.push_back(kXdgSettingsDefaultBrowser);
} else {
argv.push_back(kXdgSettingsDefaultSchemeHandler);
argv.push_back(protocol);
}
argv.push_back(libgtkui::GetDesktopName(env.get()));
int exit_code;
bool ran_ok = LaunchXdgUtility(argv, &exit_code);
if (ran_ok && exit_code == EXIT_XDG_SETTINGS_SYNTAX_ERROR) {
if (GetChromeVersionOfScript(kXdgSettings, &argv[0])) {
ran_ok = LaunchXdgUtility(argv, &exit_code);
}
}
return ran_ok && exit_code == EXIT_SUCCESS;
#endif
} }
// TODO(codebytere): handle/replace GetChromeVersionOfScript // TODO(codebytere): handle/replace GetChromeVersionOfScript
bool Browser::IsDefaultProtocolClient(const std::string& protocol, // https://portland.freedesktop.org/doc/xdg-settings.html
mate::Arguments* args) { // https://cs.chromium.org/chromium/src/chrome/browser/shell_integration_linux.cc?sq=package:chromium&l=78
bool Browser::IsDefaultProtocolClient(const std::string& protocol) {
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
return UNKNOWN_DEFAULT; return UNKNOWN_DEFAULT;
#else #else
@ -91,28 +66,19 @@ bool Browser::IsDefaultProtocolClient(const std::string& protocol,
argv.push_back(kXdgSettingsDefaultSchemeHandler); argv.push_back(kXdgSettingsDefaultSchemeHandler);
argv.push_back(protocol); argv.push_back(protocol);
} }
argv.push_back(shell_integration_linux::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_XDG_SETTINGS_SYNTAX_ERROR) {
if (GetChromeVersionOfScript(kXdgSettings, &argv[0])) {
ran_ok = base::GetAppOutputWithExitCode(base::CommandLine(argv), &reply,
&success_code);
}
}
if (!ran_ok || success_code != EXIT_SUCCESS) { if (!ran_ok || success_code != EXIT_SUCCESS) return false;
// xdg-settings failed: we can't determine or set the default browser.
return UNKNOWN_DEFAULT;
}
// 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)
? IS_DEFAULT ? true
: NOT_DEFAULT; : false;
#endif #endif
} }
@ -152,4 +118,45 @@ bool Browser::IsUnityRunning() {
return unity::IsRunning(); return unity::IsRunning();
} }
/* Helper Functions */
bool LaunchXdgUtility(const std::vector<std::string>& argv, int* exit_code) {
*exit_code = EXIT_FAILURE;
int devnull = open("/dev/null", O_RDONLY);
if (devnull < 0)
return false;
base::LaunchOptions options;
options.fds_to_remap.push_back(std::make_pair(devnull, STDIN_FILENO));
base::Process process = base::LaunchProcess(argv, options);
close(devnull);
if (!process.IsValid())
return false;
return process.WaitForExit(exit_code);
}
bool SetDefaultWebClient(const std::string& protocol) {
#if defined(OS_CHROMEOS)
return true;
#else
std::unique_ptr<base::Environment> env(base::Environment::Create());
std::vector<std::string> argv;
argv.push_back(kXdgSettings);
argv.push_back("set");
if (protocol.empty()) {
argv.push_back(kXdgSettingsDefaultBrowser);
} else {
argv.push_back(kXdgSettingsDefaultSchemeHandler);
argv.push_back(protocol);
}
argv.push_back(libgtkui::GetDesktopName(env.get()));
int exit_code;
bool ran_ok = LaunchXdgUtility(argv, &exit_code);
return ran_ok && exit_code == EXIT_SUCCESS;
#endif
}
} // namespace atom } // namespace atom