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/aura/env.cc | |
| 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/aura/env.cc')
| -rw-r--r-- | chromium/ui/aura/env.cc | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/chromium/ui/aura/env.cc b/chromium/ui/aura/env.cc index 56d2ef94f1c..22b7aac67d4 100644 --- a/chromium/ui/aura/env.cc +++ b/chromium/ui/aura/env.cc @@ -25,6 +25,10 @@ #include "ui/ozone/public/ozone_platform.h" #endif +#if defined(USE_X11) +#include "ui/gfx/switches.h" +#endif + namespace aura { namespace { @@ -205,7 +209,15 @@ bool Env::initial_throttle_input_on_resize_ = true; Env::Env() : env_controller_(std::make_unique<EnvInputStateController>(this)), gesture_recognizer_(std::make_unique<ui::GestureRecognizerImpl>()), - input_state_lookup_(InputStateLookup::Create()) {} + input_state_lookup_(InputStateLookup::Create()) { +#if defined(USE_X11) + // In Ozone/X11, the cursor factory is initialized by the platform + // initialization code. + if (!features::IsUsingOzonePlatform() && + !base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kHeadless)) + cursor_factory_ = std::make_unique<ui::X11CursorFactory>(); +#endif +} void Env::Init() { #if defined(USE_OZONE) |