github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-09 15:38:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: compilation failure after chromium upgrade (#19787)

Browse Source
This commit is contained in:
Cheng Zhao
2019-08-16 23:55:34 +09:00
committed by Shelley Vohr
parent c3bb73a711
commit 2595cb5698
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
shell/browser/api/atom_api_web_request_ns.cc
View File

@@ -105,12 +105,9 @@ void ToDictionary(gin::Dictionary* details, extensions::WebRequestInfo* info) {
details->Set("url", info->url);
details->Set("method", info->method);
details->Set("timestamp", base::Time::Now().ToDoubleT() * 1000);
details->Set("resourceType", info->type);
if (!info->response_ip.empty())
details->Set("ip", info->response_ip);
if (info->type.has_value())
details->Set("resourceType", info->type.value());
else
details->Set("resourceType", base::StringPiece("other"));
if (info->response_headers) {
details->Set("fromCache", info->response_from_cache);
details->Set("responseHeaders", info->response_headers.get());

2
shell/common/api/atom_api_native_theme.cc
View File

@@ -29,7 +29,7 @@ void NativeTheme::OnNativeThemeUpdated(ui::NativeTheme* theme) {
}
bool NativeTheme::ShouldUseDarkColors() {
return theme_->SystemDarkModeEnabled();
return theme_->ShouldUseDarkColors();
}
bool NativeTheme::ShouldUseHighContrastColors() {