mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
* chore: bump chromium in DEPS to 90.0.4430.19 * build: add 'use_rts' definition Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2694187 (cherry picked from commitb820b4078d) * chore: bump chromium in DEPS to 91.0.4441.0 * chore: update patches (cherry picked from commit55e50a0879) * chore: media_internal_resources becomes resources Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2699022 (cherry picked from commite715b9c921) * chore: update patches (cherry picked from commitc8148febfa) * refactor: extensions::ViewType moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2710351 (cherry picked from commit87df2766ba) * chore: might_have_observers has been removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2667839 (cherry picked from commite900271bea) * refactor: CertVerifier is not in the network namespace anymore Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2689805 (cherry picked from commiteccfa516c5) * refactor: ExtensionUserScriptManager is now UserScriptManager Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2657617 (cherry picked from commit2fed02556d) * refactor: content::SiteInstance::GetSiteForURL was removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2680274 (cherry picked from commit0d94e0d1d9) * refactor: MenuItemType was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2071443 (cherry picked from commit1a296e59c2) * refactor: extensions::ViewType was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2710351 (cherry picked from commitdc36e8e6fc) * refacotr: grit::ResourceMap replaced with webui::ResourcePath Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2685601 (cherry picked from commit59669e99cb) * refactor: blink::MenuItem::Type was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2071443 (cherry picked from commitbe627568b2) * refactor: CreateDataPipe deprecated form was removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2698090 (cherry picked from commit77ad17b383) * refactor: DesktopMediaList::Type replaces content::DesktopMediaType_* Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2700637 (cherry picked from commit4e02d9407a) * chore: wire up activation_time in OSR Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2638372 (cherry picked from commitf51f427646) * chore: remove deleted file from chromium_src list (cherry picked from commit59432fe30a) * chore: fix lint (cherry picked from commit54cc68dd7a) * update patches (cherry picked from commite99e6a5a8a) * chore: update patches (cherry picked from commit1e16606524) * fixup gn check (cherry picked from commit8f4e362d8f) * update to xcode 12.4.0 Needed because of8008deb41c(cherry picked from commitfae4d87a5a) * 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 (cherry picked from commitd4bec23bde) * 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 (cherry picked from commit9e336f5d0c) * 2752932: Associate each AwProxyingURLLoaderFactory with a frame tree node id. https://chromium-review.googlesource.com/c/chromium/src/+/2752932 (cherry picked from commit08036802cb) * 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer. https://chromium-review.googlesource.com/c/chromium/src/+/2651385 (cherry picked from commit676f74f3dc) * 2734095: Introduce StoragePartitionId type to wrap current string representation. https://chromium-review.googlesource.com/c/chromium/src/+/2734095 (cherry picked from commit76538d2d38) * chore: bump chromium in DEPS to 90.0.4430.19 * chore: bump chromium in DEPS to 90.0.4430.30 * chore: bump chromium in DEPS to 90.0.4430.40 * chore: bump chromium in DEPS to 90.0.4430.51 * chore: bump chromium in DEPS to 91.0.4446.0 * chore: bump chromium in DEPS to 91.0.4448.0 (cherry picked from commit003dd6c16c) * Update patches (cherry picked from commit9f5e3f6685) * 2743594: Remove WebSize from blink. https://chromium-review.googlesource.com/c/chromium/src/+/2743594 (cherry picked from commitb15b820bca) * 2725403: Add URLLoaderClient::OnReceiveEarlyHints() https://chromium-review.googlesource.com/c/chromium/src/+/2725403 (cherry picked from commit185c343b22) * 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer. https://chromium-review.googlesource.com/c/chromium/src/+/2651385 (cherry picked from commit88bbe2a352) * 2721718: Move HostID to extensions::mojom::HostID https://chromium-review.googlesource.com/c/chromium/src/+/2721718 (cherry picked from commit3010dd93e3) * 2733070: Rename observer to URLLoaderNetworkServiceObserver https://chromium-review.googlesource.com/c/chromium/src/+/2733070 (cherry picked from commitd54bee03d0) * Use nogncheck for content/browser/site_instance_impl.h This is needed because //content/browser:browser is not a visible target (cherry picked from commit5fc298ee5f) * 2648046: Introduce alert notification helper .app https://chromium-review.googlesource.com/c/chromium/src/+/2648046 (cherry picked from commit2cd53eb46a) * 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 (cherry picked from commitf1bb6be4b9) * only include mac notifications on mac (cherry picked from commit3160e608e2) * add additional skipping of atk toolchain check (cherry picked from commit86d23cee40) * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 (cherry picked from commit22d8f22cfb) * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 (cherry picked from commitec893f8322) * 2720306: [api] Remove deprecated [Shared]ArrayBuffer API https://chromium-review.googlesource.com/c/v8/v8/+/2720306 (cherry picked from commitd0989802bd) * Fixup 2721718: Move HostID to extensions::mojom::HostID (cherry picked from commit29dfabadfd) * fixup 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer (cherry picked from commit97b6868e9c) * Fixup 2752406: [LSC] Replace base::string16 with std::u16string in //ui (cherry picked from commitb6d2ae0455) * Fixup 2725403: Add URLLoaderClient::OnReceiveEarlyHints() (cherry picked from commit7e961d8a37) * update node headers (cherry picked from commitc49bc282d5) * 2693008: Fix loading non-system cursors on Windows on browser_tests https://chromium-review.googlesource.com/c/chromium/src/+/2693008 (cherry picked from commit3b183854ff) * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 (cherry picked from commit2d3c65beca) * undo changes to WebContentsPreferences::GetPreloadPath to fix mac build (cherry picked from commitdeeb2de14b) * fix StrCat issue (cherry picked from commit451e0931bf) * incantations for WebContentsPreferences::GetPreloadPath wide strings (cherry picked from commit205f572181) * bump nan (cherry picked from commit74318705c2) * fix GetAsString maybe? (cherry picked from commitea62ecd188) * windows build fixes (cherry picked from commit5b598037bb) * more windows build fix (cherry picked from commit61cf1abd4d) * SetAppUserModelID -> wstring (cherry picked from commit83d93bcbdc) * upgrade nan dep in tests (cherry picked from commit4f97b9303c) * update patch * wstrings are cross-platform (cherry picked from commit7f7b1f6c8a) * linter (cherry picked from commitaaf03765ed) * only bind setAppUserModelId on windows (cherry picked from commit640a145112) * well that was an odyssey (cherry picked from commitdd975328a0) * backport fcdf35e from v8 to fix nan crash (cherry picked from commit606fd87d1e) * disable typedarrays-test.js (cherry picked from commit01ca00ec82) * don't defer in NSWindow creation https://chromium-review.googlesource.com/c/chromium/src/+/2707696 (cherry picked from commit3122820e58) * use PartitionAllocator for ArrayBuffers in the main process (cherry picked from commit1f575ca3af) * fix patches (cherry picked from commit54e72fa8e3) * chore: omit some unnecessary conversions (cherry picked from commit0f3620099a) * refactor: make LoginItemSettings::path a wstring (cherry picked from commit9127cff58b) * refactor: make ShowTaskDialog take a wstr (cherry picked from commit1594c54933) * Revert "refactor: make LoginItemSettings::path a wstring" This reverts commit9127cff58b. (cherry picked from commit9684d85101) * fixup patches This reverts commit0cc08813a6. * update patches after merge Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: John Kleinschmidt <jkleinsc@github.com> Co-authored-by: Jeremy Rose <nornagon@nornagon.net> Co-authored-by: Charles Kerr <charles@charleskerr.com>
234 lines
6.9 KiB
C++
234 lines
6.9 KiB
C++
// Copyright (c) 2013 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/browser.h"
|
|
|
|
#include <fcntl.h>
|
|
#include <stdlib.h>
|
|
|
|
#include "base/command_line.h"
|
|
#include "base/environment.h"
|
|
#include "base/process/launch.h"
|
|
#include "electron/electron_version.h"
|
|
#include "shell/browser/native_window.h"
|
|
#include "shell/browser/window_list.h"
|
|
#include "shell/common/application_info.h"
|
|
|
|
#if defined(OS_LINUX)
|
|
#include "shell/browser/linux/unity_service.h"
|
|
#include "ui/gtk/gtk_util.h"
|
|
#endif
|
|
|
|
namespace electron {
|
|
|
|
const char kXdgSettings[] = "xdg-settings";
|
|
const char kXdgSettingsDefaultSchemeHandler[] = "default-url-scheme-handler";
|
|
|
|
// The use of the ForTesting flavors is a hack workaround to avoid having to
|
|
// patch these as friends into the associated guard classes.
|
|
class LaunchXdgUtilityScopedAllowBaseSyncPrimitives
|
|
: public base::ScopedAllowBaseSyncPrimitivesForTesting {};
|
|
|
|
class GetXdgAppOutputScopedAllowBlocking
|
|
: public base::ScopedAllowBlockingForTesting {};
|
|
|
|
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.emplace_back(devnull, STDIN_FILENO);
|
|
|
|
base::Process process = base::LaunchProcess(argv, options);
|
|
close(devnull);
|
|
|
|
if (!process.IsValid())
|
|
return false;
|
|
LaunchXdgUtilityScopedAllowBaseSyncPrimitives allow_base_sync_primitives;
|
|
return process.WaitForExit(exit_code);
|
|
}
|
|
|
|
base::Optional<std::string> GetXdgAppOutput(
|
|
const std::vector<std::string>& argv) {
|
|
std::string reply;
|
|
int success_code;
|
|
GetXdgAppOutputScopedAllowBlocking allow_blocking;
|
|
bool ran_ok = base::GetAppOutputWithExitCode(base::CommandLine(argv), &reply,
|
|
&success_code);
|
|
|
|
if (!ran_ok || success_code != EXIT_SUCCESS)
|
|
return base::Optional<std::string>();
|
|
|
|
return base::make_optional(reply);
|
|
}
|
|
|
|
bool SetDefaultWebClient(const std::string& protocol) {
|
|
std::unique_ptr<base::Environment> env(base::Environment::Create());
|
|
|
|
std::vector<std::string> argv = {kXdgSettings, "set"};
|
|
if (!protocol.empty()) {
|
|
argv.emplace_back(kXdgSettingsDefaultSchemeHandler);
|
|
argv.emplace_back(protocol);
|
|
}
|
|
std::string desktop_name;
|
|
if (!env->GetVar("CHROME_DESKTOP", &desktop_name)) {
|
|
return false;
|
|
}
|
|
argv.emplace_back(desktop_name);
|
|
|
|
int exit_code;
|
|
bool ran_ok = LaunchXdgUtility(argv, &exit_code);
|
|
return ran_ok && exit_code == EXIT_SUCCESS;
|
|
}
|
|
|
|
void Browser::AddRecentDocument(const base::FilePath& path) {}
|
|
|
|
void Browser::ClearRecentDocuments() {}
|
|
|
|
void Browser::SetAppUserModelID(const std::wstring& name) {}
|
|
|
|
bool Browser::SetAsDefaultProtocolClient(const std::string& protocol,
|
|
gin::Arguments* args) {
|
|
return SetDefaultWebClient(protocol);
|
|
}
|
|
|
|
bool Browser::IsDefaultProtocolClient(const std::string& protocol,
|
|
gin::Arguments* args) {
|
|
std::unique_ptr<base::Environment> env(base::Environment::Create());
|
|
|
|
if (protocol.empty())
|
|
return false;
|
|
|
|
std::string desktop_name;
|
|
if (!env->GetVar("CHROME_DESKTOP", &desktop_name))
|
|
return false;
|
|
const std::vector<std::string> argv = {kXdgSettings, "check",
|
|
kXdgSettingsDefaultSchemeHandler,
|
|
protocol, desktop_name};
|
|
const auto output = GetXdgAppOutput(argv);
|
|
if (!output)
|
|
return false;
|
|
|
|
// Allow any reply that starts with "yes".
|
|
return base::StartsWith(output.value(), "yes", base::CompareCase::SENSITIVE);
|
|
}
|
|
|
|
// Todo implement
|
|
bool Browser::RemoveAsDefaultProtocolClient(const std::string& protocol,
|
|
gin::Arguments* args) {
|
|
return false;
|
|
}
|
|
|
|
std::u16string Browser::GetApplicationNameForProtocol(const GURL& url) {
|
|
const std::vector<std::string> argv = {
|
|
"xdg-mime", "query", "default",
|
|
std::string("x-scheme-handler/") + url.scheme()};
|
|
|
|
return base::ASCIIToUTF16(GetXdgAppOutput(argv).value_or(std::string()));
|
|
}
|
|
|
|
bool Browser::SetBadgeCount(base::Optional<int> count) {
|
|
if (IsUnityRunning() && count.has_value()) {
|
|
unity::SetDownloadCount(count.value());
|
|
badge_count_ = count.value();
|
|
return true;
|
|
} else {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
void Browser::SetLoginItemSettings(LoginItemSettings settings) {}
|
|
|
|
Browser::LoginItemSettings Browser::GetLoginItemSettings(
|
|
const LoginItemSettings& options) {
|
|
return LoginItemSettings();
|
|
}
|
|
|
|
std::string Browser::GetExecutableFileVersion() const {
|
|
return GetApplicationVersion();
|
|
}
|
|
|
|
std::string Browser::GetExecutableFileProductName() const {
|
|
return GetApplicationName();
|
|
}
|
|
|
|
bool Browser::IsUnityRunning() {
|
|
return unity::IsRunning();
|
|
}
|
|
|
|
bool Browser::IsEmojiPanelSupported() {
|
|
return false;
|
|
}
|
|
|
|
void Browser::ShowAboutPanel() {
|
|
const auto& opts = about_panel_options_;
|
|
|
|
if (!opts.is_dict()) {
|
|
LOG(WARNING) << "Called showAboutPanel(), but didn't use "
|
|
"setAboutPanelSettings() first";
|
|
return;
|
|
}
|
|
|
|
GtkWidget* dialogWidget = gtk_about_dialog_new();
|
|
GtkAboutDialog* dialog = GTK_ABOUT_DIALOG(dialogWidget);
|
|
|
|
const std::string* str;
|
|
const base::Value* val;
|
|
|
|
if ((str = opts.FindStringKey("applicationName"))) {
|
|
gtk_about_dialog_set_program_name(dialog, str->c_str());
|
|
}
|
|
if ((str = opts.FindStringKey("applicationVersion"))) {
|
|
gtk_about_dialog_set_version(dialog, str->c_str());
|
|
}
|
|
if ((str = opts.FindStringKey("copyright"))) {
|
|
gtk_about_dialog_set_copyright(dialog, str->c_str());
|
|
}
|
|
if ((str = opts.FindStringKey("website"))) {
|
|
gtk_about_dialog_set_website(dialog, str->c_str());
|
|
}
|
|
if ((str = opts.FindStringKey("iconPath"))) {
|
|
GError* error = nullptr;
|
|
constexpr int width = 64; // width of about panel icon in pixels
|
|
constexpr int height = 64; // height of about panel icon in pixels
|
|
|
|
// set preserve_aspect_ratio to true
|
|
GdkPixbuf* icon =
|
|
gdk_pixbuf_new_from_file_at_size(str->c_str(), width, height, &error);
|
|
if (error != nullptr) {
|
|
g_warning("%s", error->message);
|
|
g_clear_error(&error);
|
|
} else {
|
|
gtk_about_dialog_set_logo(dialog, icon);
|
|
g_clear_object(&icon);
|
|
}
|
|
}
|
|
|
|
if ((val = opts.FindListKey("authors"))) {
|
|
std::vector<const char*> cstrs;
|
|
for (const auto& authorVal : val->GetList()) {
|
|
if (authorVal.is_string()) {
|
|
cstrs.push_back(authorVal.GetString().c_str());
|
|
}
|
|
}
|
|
if (cstrs.empty()) {
|
|
LOG(WARNING) << "No author strings found in 'authors' array";
|
|
} else {
|
|
cstrs.push_back(nullptr); // null-terminated char* array
|
|
gtk_about_dialog_set_authors(dialog, cstrs.data());
|
|
}
|
|
}
|
|
|
|
gtk_dialog_run(GTK_DIALOG(dialog));
|
|
gtk_widget_destroy(dialogWidget);
|
|
}
|
|
|
|
void Browser::SetAboutPanelOptions(base::DictionaryValue options) {
|
|
about_panel_options_ = std::move(options);
|
|
}
|
|
|
|
} // namespace electron
|