diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-22 15:28:16 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-01-09 16:10:22 +0000 |
| commit | 4a85e3dcca015b30dff457dc41712fb6d0b437e9 (patch) | |
| tree | 2bca52844136e9791a6a861267be61b61eada244 /src/core/web_engine_context.cpp | |
| parent | cffba828bc53fab284f030b8131ea47913108618 (diff) | |
Make AccessiblityActivationObserver separate of RWHV
It is a global control anyway, and with future Chromium headers, there
are conflicts with qaccessibility.h.
Change-Id: Ife43340684b8b9498b1f4cd3f6fbe450d88794ec
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'src/core/web_engine_context.cpp')
| -rw-r--r-- | src/core/web_engine_context.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index 0763b9dac..912a6128e 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -80,16 +80,19 @@ #include "content/public/app/sandbox_helper_win.h" #endif // OS_WIN +#ifndef QT_NO_ACCESSIBILITY +#include "accessibility_activation_observer.h" +#endif #include "api/qwebengineurlscheme.h" -#include "profile_adapter.h" #include "content_browser_client_qt.h" #include "content_client_qt.h" #include "content_main_delegate_qt.h" #include "devtools_manager_delegate_qt.h" #include "media_capture_devices_dispatcher.h" #include "net/webui_controller_factory_qt.h" -#include "type_conversion.h" #include "ozone/gl_context_qt.h" +#include "profile_adapter.h" +#include "type_conversion.h" #include "web_engine_library_info.h" #include <QFileInfo> @@ -608,6 +611,10 @@ void WebEngineContext::initialize() m_printJobManager.reset(new printing::PrintJobManager()); #endif +#ifndef QT_NO_ACCESSIBILITY + m_accessibilityActivationObserver.reset(new AccessibilityActivationObserver()); +#endif + content::WebUIControllerFactory::RegisterFactory(WebUIControllerFactoryQt::GetInstance()); } |