diff options
Diffstat (limited to 'www/chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc')
| -rw-r--r-- | www/chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/www/chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc b/www/chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc index 16d8033cd983..b982662d1be4 100644 --- a/www/chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc +++ b/www/chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc @@ -1,7 +1,7 @@ ---- weblayer/browser/browser_main_parts_impl.cc.orig 2020-07-07 21:58:19 UTC +--- weblayer/browser/browser_main_parts_impl.cc.orig 2020-11-13 06:37:06 UTC +++ weblayer/browser/browser_main_parts_impl.cc -@@ -53,7 +53,7 @@ - #if defined(USE_AURA) && defined(USE_X11) +@@ -63,7 +63,7 @@ + #include "ui/base/ui_base_features.h" #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck #endif -#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX) @@ -9,12 +9,12 @@ #include "ui/base/ime/init/input_method_initializer.h" #endif -@@ -128,7 +128,7 @@ int BrowserMainPartsImpl::PreEarlyInitialization() { - #if defined(USE_X11) - ui::SetDefaultX11ErrorHandlers(); +@@ -157,7 +157,7 @@ int BrowserMainPartsImpl::PreEarlyInitialization() { + if (!features::IsUsingOzonePlatform()) + ui::SetDefaultX11ErrorHandlers(); #endif --#if defined(USE_AURA) && defined(OS_LINUX) -+#if defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD)) +-#if defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_CHROMEOS)) ++#if defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) ui::InitializeInputMethodForTesting(); #endif #if defined(OS_ANDROID) |