diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/ui/views/linux_ui | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/ui/views/linux_ui')
| -rw-r--r-- | chromium/ui/views/linux_ui/linux_ui.cc | 1 | ||||
| -rw-r--r-- | chromium/ui/views/linux_ui/linux_ui.h | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/chromium/ui/views/linux_ui/linux_ui.cc b/chromium/ui/views/linux_ui/linux_ui.cc index 27ae4e29d04..585fea624f8 100644 --- a/chromium/ui/views/linux_ui/linux_ui.cc +++ b/chromium/ui/views/linux_ui/linux_ui.cc @@ -28,7 +28,6 @@ void LinuxUI::SetInstance(LinuxUI* instance) { SkiaFontDelegate::SetInstance(instance); ShellDialogLinux::SetInstance(instance); ui::SetTextEditKeyBindingsDelegate(instance); - ui::CursorThemeManagerLinux::SetInstance(instance); } LinuxUI* LinuxUI::instance() { diff --git a/chromium/ui/views/linux_ui/linux_ui.h b/chromium/ui/views/linux_ui/linux_ui.h index 55d73138880..7641a91abf0 100644 --- a/chromium/ui/views/linux_ui/linux_ui.h +++ b/chromium/ui/views/linux_ui/linux_ui.h @@ -12,7 +12,7 @@ #include "base/macros.h" #include "build/buildflag.h" #include "third_party/skia/include/core/SkColor.h" -#include "ui/base/cursor/cursor_theme_manager_linux.h" +#include "ui/base/cursor/cursor_theme_manager.h" #include "ui/base/ime/linux/linux_input_method_context_factory.h" #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" #include "ui/gfx/animation/animation_settings_provider_linux.h" @@ -55,7 +55,7 @@ class VIEWS_EXPORT LinuxUI : public ui::LinuxInputMethodContextFactory, public gfx::SkiaFontDelegate, public ui::ShellDialogLinux, public ui::TextEditKeyBindingsDelegateAuraLinux, - public ui::CursorThemeManagerLinux, + public ui::CursorThemeManager, public gfx::AnimationSettingsProviderLinux { public: using UseSystemThemeCallback = |