mirror of
https://github.com/electron/electron.git
synced 2026-02-26 03:01:17 -05:00
* chore: bump chromium in DEPS to 89.0.4386.0 * update patches * 2596667: Reland "[printing] Mojofy PrintHostMsg_CheckForCancel" https://chromium-review.googlesource.com/c/chromium/src/+/2596667 (cherry picked from commit70fb0fe694) * fixup for 2596667: Reland "[printing] Mojofy PrintHostMsg_CheckForCancel * 2596880: Refactor frame detach helpers to return a bool indicating success. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/2596880 * 2596880: Refactor frame detach helpers to return a bool indicating success. https://chromium-review.googlesource.com/c/chromium/src/+/2596880 * 2615203: [Code health] Convert DispatchCallback to OnceCallback Ref: https://chromium-review.googlesource.com/c/chromium/src/+/2615203 * 2587618: Refactor contrast tracking in NativeTheme Ref: https://chromium-review.googlesource.com/c/chromium/src/+/2587618 * 2596289: Use ContextMenuDataMediaType Mojo enum instead of the native one Ref: https://chromium-review.googlesource.com/c/chromium/src/+/2596289 * 2587049: Move blink.mojom.DragOperation to //ui/base/dragdrop Ref: https://chromium-review.googlesource.com/c/chromium/src/+/2587049 * 2585255: Move web_isolated_world_ids.h from public/platform to renderer/platform/bindings in blink Ref: https://chromium-review.googlesource.com/c/chromium/src/+/2585255 * 2602887: Convert CheckForUpdates callback to OnceCallback Ref: https://chromium-review.googlesource.com/c/chromium/src/+/2602887 * 2601061: Convert ChromeManagementAPIDelegate to OnceCallback Ref: https://chromium-review.googlesource.com/c/chromium/src/+/2601061 * 2600391: Convert MessagingDelegate to OnceCallback Ref: https://chromium-review.googlesource.com/c/chromium/src/+/2600391 * 2583590: webui: Remove UseWebUIBindingsForURL Ref: https://chromium-review.googlesource.com/c/chromium/src/+/2583590 * 2562002: Deprecate ResourceType in ExtensionsBrowserClient Ref: https://chromium-review.googlesource.com/c/chromium/src/+/2562002 * chore: handle AXPropertyFilter::SCRIPT in accessibility_ui Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2563923 * chore: add DISPLAY_CAPTURE permission to converter Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2551098 * fix: add utility class for linting * 2614784: Remove SchemeRegistry APIs for handling local and secure schemes Ref; https://chromium-review.googlesource.com/c/chromium/src/+/2614784 * chore: bump chromium in DEPS to 89.0.4387.0 * 2618392: Rename PAGE to ENTRY in NAVIGATION_TYPE values. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/2618392 * 2616421: Factor out DnsConfigService::Watcher logic Ref: https://chromium-review.googlesource.com/c/chromium/src/+/2616421 * chore: update Chromium patch indices * 2617866: Componentize OptimizationHintsComponentInstaller for reuse on iOS Ref: https://chromium-review.googlesource.com/c/chromium/src/+/2617866 * refactor: refactor x11 event handling, xeventobserver is now x11:eventobserver Ref: https://chromium-review.googlesource.com/c/chromium/src/+/2577887 Ref: https://chromium-review.googlesource.com/c/chromium/src/+/2585750 * 2595524: [XProto] Use x11 namespace instead of gfx for //ui/gfx/x Ref: https://chromium-review.googlesource.com/c/chromium/src/+/2595524 * build: change ui namespace to x11 Ref:c38f8571a8:ui/gfx/x/xproto_util.h;dlc=ba9145d0c7f2b10e869e2ba482ca05b75ca35812 * 2600437: [XProto] Remove old property setters/getters from x11_util Ref: https://chromium-review.googlesource.com/c/chromium/src/+/2600437 * chore: remove deleted headers * 2402398: Adding ViewsAXTreeManager output to chrome://accessibility Ref: https://chromium-review.googlesource.com/c/chromium/src/+/2402398 * chore: revert to old version of circleci for mac builds Ref: https://gn.googlesource.com/gn/+/0d67e272bdb8145f87d238bc0b2cb8bf80ccec90 * fix: remove outdated --experimental-wasm-bigint flag * chore: bump chromium in DEPS to 89.0.4389.0 * update patches * 2592803: [Extensions] Use policy-enforced update URL in ManagementApi Ref: https://chromium-review.googlesource.com/c/chromium/src/+/2592803 * 2599731: Make network::DataElement a union with absl::variant Ref: https://chromium-review.googlesource.com/c/chromium/src/+/2599731 * 2614784: Remove SchemeRegistry APIs for handling local and secure schemes https://chromium-review.googlesource.com/c/chromium/src/+/2614784 * 2624711: Inline and remove peekLast() https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/2624711 * chore: add patch to fix blink prefs fetching during frame swap Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com> * update patches * fix: do not make invalid SKImageRep in FrameSubscriber Ref: https://chromium-review.googlesource.com/c/chromium/src/+/2572896 * Revert "2616421: Factor out DnsConfigService::Watcher logic" This reverts commit7214406ecb. * 2616421: Factor out DnsConfigService::Watcher logic https://chromium-review.googlesource.com/c/chromium/src/+/2616421 * chore: bump chromium in DEPS to 89.0.4388.2 * chore: update patches * 2581958: [api] Dehandlify FunctionTemplate initialization Ref: https://chromium-review.googlesource.com/c/v8/v8/+/2581958 * Revert "2592803: [Extensions] Use policy-enforced update URL in ManagementApi" This reverts commit00f4041cc9. * 2572896: Prevent making invalid SkImageReps Ref: https://chromium-review.googlesource.com/c/chromium/src/+/2572896 * fix: sandbox exit event to preload test * fix: restore clipboard_win patch * ci: force delete user app data directories * chore: clean up typing on webview-spec * docs: undocument display-capture ses.permission option Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: VerteDinde <khammond@slack-corp.com> Co-authored-by: VerteDinde <keeleymhammond@gmail.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
174 lines
5.3 KiB
C++
174 lines
5.3 KiB
C++
// Copyright (c) 2019 Slack Technologies, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/api/electron_api_native_theme.h"
|
|
|
|
#include <string>
|
|
|
|
#include "base/task/post_task.h"
|
|
#include "content/public/browser/browser_task_traits.h"
|
|
#include "content/public/browser/browser_thread.h"
|
|
#include "gin/handle.h"
|
|
#include "shell/common/gin_converters/std_converter.h"
|
|
#include "shell/common/gin_helper/dictionary.h"
|
|
#include "shell/common/gin_helper/object_template_builder.h"
|
|
#include "shell/common/node_includes.h"
|
|
#include "ui/gfx/color_utils.h"
|
|
#include "ui/native_theme/native_theme.h"
|
|
|
|
namespace electron {
|
|
|
|
namespace api {
|
|
|
|
gin::WrapperInfo NativeTheme::kWrapperInfo = {gin::kEmbedderNativeGin};
|
|
|
|
NativeTheme::NativeTheme(v8::Isolate* isolate,
|
|
ui::NativeTheme* ui_theme,
|
|
ui::NativeTheme* web_theme)
|
|
: ui_theme_(ui_theme), web_theme_(web_theme) {
|
|
ui_theme_->AddObserver(this);
|
|
}
|
|
|
|
NativeTheme::~NativeTheme() {
|
|
ui_theme_->RemoveObserver(this);
|
|
}
|
|
|
|
void NativeTheme::OnNativeThemeUpdatedOnUI() {
|
|
Emit("updated");
|
|
}
|
|
|
|
void NativeTheme::OnNativeThemeUpdated(ui::NativeTheme* theme) {
|
|
base::PostTask(FROM_HERE, {content::BrowserThread::UI},
|
|
base::BindOnce(&NativeTheme::OnNativeThemeUpdatedOnUI,
|
|
base::Unretained(this)));
|
|
}
|
|
|
|
void NativeTheme::SetThemeSource(ui::NativeTheme::ThemeSource override) {
|
|
ui_theme_->set_theme_source(override);
|
|
web_theme_->set_theme_source(override);
|
|
#if defined(OS_MAC)
|
|
// Update the macOS appearance setting for this new override value
|
|
UpdateMacOSAppearanceForOverrideValue(override);
|
|
#endif
|
|
// TODO(MarshallOfSound): Update all existing browsers windows to use GTK dark
|
|
// theme
|
|
}
|
|
|
|
ui::NativeTheme::ThemeSource NativeTheme::GetThemeSource() const {
|
|
return ui_theme_->theme_source();
|
|
}
|
|
|
|
bool NativeTheme::ShouldUseDarkColors() {
|
|
return ui_theme_->ShouldUseDarkColors();
|
|
}
|
|
|
|
bool NativeTheme::ShouldUseHighContrastColors() {
|
|
return ui_theme_->UserHasContrastPreference();
|
|
}
|
|
|
|
#if defined(OS_MAC)
|
|
const CFStringRef WhiteOnBlack = CFSTR("whiteOnBlack");
|
|
const CFStringRef UniversalAccessDomain = CFSTR("com.apple.universalaccess");
|
|
#endif
|
|
|
|
// TODO(MarshallOfSound): Implement for Linux
|
|
bool NativeTheme::ShouldUseInvertedColorScheme() {
|
|
#if defined(OS_MAC)
|
|
CFPreferencesAppSynchronize(UniversalAccessDomain);
|
|
Boolean keyExistsAndHasValidFormat = false;
|
|
Boolean is_inverted = CFPreferencesGetAppBooleanValue(
|
|
WhiteOnBlack, UniversalAccessDomain, &keyExistsAndHasValidFormat);
|
|
if (!keyExistsAndHasValidFormat)
|
|
return false;
|
|
return is_inverted;
|
|
#else
|
|
return ui_theme_->GetPlatformHighContrastColorScheme() ==
|
|
ui::NativeTheme::PlatformHighContrastColorScheme::kDark;
|
|
#endif
|
|
}
|
|
|
|
// static
|
|
gin::Handle<NativeTheme> NativeTheme::Create(v8::Isolate* isolate) {
|
|
ui::NativeTheme* ui_theme = ui::NativeTheme::GetInstanceForNativeUi();
|
|
ui::NativeTheme* web_theme = ui::NativeTheme::GetInstanceForWeb();
|
|
return gin::CreateHandle(isolate,
|
|
new NativeTheme(isolate, ui_theme, web_theme));
|
|
}
|
|
|
|
gin::ObjectTemplateBuilder NativeTheme::GetObjectTemplateBuilder(
|
|
v8::Isolate* isolate) {
|
|
return gin_helper::EventEmitterMixin<NativeTheme>::GetObjectTemplateBuilder(
|
|
isolate)
|
|
.SetProperty("shouldUseDarkColors", &NativeTheme::ShouldUseDarkColors)
|
|
.SetProperty("themeSource", &NativeTheme::GetThemeSource,
|
|
&NativeTheme::SetThemeSource)
|
|
.SetProperty("shouldUseHighContrastColors",
|
|
&NativeTheme::ShouldUseHighContrastColors)
|
|
.SetProperty("shouldUseInvertedColorScheme",
|
|
&NativeTheme::ShouldUseInvertedColorScheme);
|
|
}
|
|
|
|
const char* NativeTheme::GetTypeName() {
|
|
return "NativeTheme";
|
|
}
|
|
|
|
} // namespace api
|
|
|
|
} // namespace electron
|
|
|
|
namespace {
|
|
|
|
using electron::api::NativeTheme;
|
|
|
|
void Initialize(v8::Local<v8::Object> exports,
|
|
v8::Local<v8::Value> unused,
|
|
v8::Local<v8::Context> context,
|
|
void* priv) {
|
|
v8::Isolate* isolate = context->GetIsolate();
|
|
gin::Dictionary dict(isolate, exports);
|
|
dict.Set("nativeTheme", NativeTheme::Create(isolate));
|
|
}
|
|
|
|
} // namespace
|
|
|
|
namespace gin {
|
|
|
|
v8::Local<v8::Value> Converter<ui::NativeTheme::ThemeSource>::ToV8(
|
|
v8::Isolate* isolate,
|
|
const ui::NativeTheme::ThemeSource& val) {
|
|
switch (val) {
|
|
case ui::NativeTheme::ThemeSource::kForcedDark:
|
|
return ConvertToV8(isolate, "dark");
|
|
case ui::NativeTheme::ThemeSource::kForcedLight:
|
|
return ConvertToV8(isolate, "light");
|
|
case ui::NativeTheme::ThemeSource::kSystem:
|
|
default:
|
|
return ConvertToV8(isolate, "system");
|
|
}
|
|
}
|
|
|
|
bool Converter<ui::NativeTheme::ThemeSource>::FromV8(
|
|
v8::Isolate* isolate,
|
|
v8::Local<v8::Value> val,
|
|
ui::NativeTheme::ThemeSource* out) {
|
|
std::string theme_source;
|
|
if (ConvertFromV8(isolate, val, &theme_source)) {
|
|
if (theme_source == "dark") {
|
|
*out = ui::NativeTheme::ThemeSource::kForcedDark;
|
|
} else if (theme_source == "light") {
|
|
*out = ui::NativeTheme::ThemeSource::kForcedLight;
|
|
} else if (theme_source == "system") {
|
|
*out = ui::NativeTheme::ThemeSource::kSystem;
|
|
} else {
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
} // namespace gin
|
|
|
|
NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_native_theme, Initialize)
|