bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 96.0.4664.0 (#929512)

Browse Source
This commit is contained in:
Marshall Greenblatt
2021-10-18 18:17:16 -04:00
parent 4dd314dec3
commit 6872dadd74
103 changed files with 897 additions and 675 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
libcef/browser/native/native_menu_win.cc
View File

@ -21,6 +21,7 @@
#include "ui/base/l10n/l10n_util_win.h"
#include "ui/base/models/image_model.h"
#include "ui/base/models/menu_model.h"
#include "ui/color/color_provider_manager.h"
#include "ui/events/keycodes/keyboard_codes.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/font_list.h"
@ -295,11 +296,33 @@ class CefNativeMenuWin::MenuHostWindow {
ui::NativeTheme* native_theme =
ui::NativeTheme::GetInstanceForNativeUi();
// Logic from Widget::GetColorProviderKey() prior to
// https://crrev.com/e24ffe177b.
// TODO(cef): Use |native_theme->GetColorProviderKey(nullptr)| after M97
// Chromium update.
const auto color_scheme = native_theme->GetDefaultSystemColorScheme();
ui::ColorProviderManager::Key color_provider_key(
(color_scheme == ui::NativeTheme::ColorScheme::kDark)
? ui::ColorProviderManager::ColorMode::kDark
: ui::ColorProviderManager::ColorMode::kLight,
(color_scheme ==
ui::NativeTheme::ColorScheme::kPlatformHighContrast)
? ui::ColorProviderManager::ContrastMode::kHigh
: ui::ColorProviderManager::ContrastMode::kNormal,
native_theme->is_custom_system_theme()
? ui::ColorProviderManager::SystemTheme::kCustom
: ui::ColorProviderManager::SystemTheme::kDefault,
/*custom_theme=*/nullptr);
auto* color_provider =
ui::ColorProviderManager::Get().GetColorProviderFor(
color_provider_key);
// We currently don't support items with both icons and checkboxes.
const gfx::ImageSkia skia_icon =
icon.IsImage() ? icon.GetImage().AsImageSkia()
: ui::ThemedVectorIcon(icon.GetVectorIcon())
.GetImageSkia(native_theme, 16);
.GetImageSkia(color_provider, 16);
DCHECK(type != ui::MenuModel::TYPE_CHECK);
std::unique_ptr<SkCanvas> canvas = skia::CreatePlatformCanvas(