diff options
Diffstat (limited to 'www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc')
| -rw-r--r-- | www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc b/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc index f3be501ed62b..09347fba6f2c 100644 --- a/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc +++ b/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc @@ -1,6 +1,6 @@ ---- content/shell/browser/shell_browser_main_parts.cc.orig 2022-06-17 14:20:10 UTC +--- content/shell/browser/shell_browser_main_parts.cc.orig 2023-10-11 18:22:24 UTC +++ content/shell/browser/shell_browser_main_parts.cc -@@ -50,7 +50,7 @@ +@@ -51,7 +51,7 @@ #include "net/base/network_change_notifier.h" #endif @@ -9,16 +9,16 @@ #include "ui/base/ime/init/input_method_initializer.h" #endif -@@ -65,7 +65,7 @@ +@@ -68,7 +68,7 @@ #include "chromeos/lacros/dbus/lacros_dbus_thread_manager.h" #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "ui/views/linux_ui/linux_ui.h" // nogncheck - #include "ui/views/linux_ui/linux_ui_factory.h" // nogncheck + #include "ui/linux/linux_ui.h" // nogncheck + #include "ui/linux/linux_ui_factory.h" // nogncheck #endif -@@ -129,7 +129,7 @@ void ShellBrowserMainParts::PostCreateMainMessageLoop( +@@ -139,7 +139,7 @@ void ShellBrowserMainParts::PostCreateMainMessageLoop( } int ShellBrowserMainParts::PreEarlyInitialization() { @@ -27,21 +27,21 @@ ui::InitializeInputMethodForTesting(); #endif #if BUILDFLAG(IS_ANDROID) -@@ -153,7 +153,7 @@ void ShellBrowserMainParts::ToolkitInitialized() { +@@ -168,7 +168,7 @@ void ShellBrowserMainParts::ToolkitInitialized() { if (switches::IsRunWebTestsSwitchPresent()) return; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - views::LinuxUI::SetInstance(CreateLinuxUi()); + ui::LinuxUi::SetInstance(ui::GetDefaultLinuxUi()); #endif } -@@ -196,7 +196,7 @@ void ShellBrowserMainParts::PostMainMessageLoopRun() { +@@ -215,7 +215,7 @@ void ShellBrowserMainParts::PostMainMessageLoopRun() { ShellDevToolsManagerDelegate::StopHttpHandler(); browser_context_.reset(); off_the_record_browser_context_.reset(); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - views::LinuxUI::SetInstance(nullptr); + ui::LinuxUi::SetInstance(nullptr); #endif performance_manager_lifetime_.reset(); |