|
29 | 29 | // TODO(crbug.com/40188745): Implement crash reporter integration for Fuchsia. |
30 | 30 | --- a/chrome/browser/ui/startup/bad_flags_prompt.cc |
31 | 31 | +++ b/chrome/browser/ui/startup/bad_flags_prompt.cc |
32 | | -@@ -60,10 +60,12 @@ |
33 | | - static const char* kBadFlags[] = { |
34 | | - network::switches::kIgnoreCertificateErrorsSPKIList, |
| 32 | +@@ -67,10 +67,12 @@ |
| 33 | + switches::kHostRules, |
| 34 | + |
35 | 35 | // These flags disable sandbox-related security. |
36 | 36 | +#ifndef __TERMUX__ |
37 | 37 | sandbox::policy::switches::kDisableGpuSandbox, |
|
44 | 44 | #endif |
45 | 45 | --- a/chrome/app/chrome_main_delegate.cc |
46 | 46 | +++ b/chrome/app/chrome_main_delegate.cc |
47 | | -@@ -235,6 +235,10 @@ |
48 | | - #include "ui/gfx/switches.h" |
49 | | - #endif |
| 47 | +@@ -226,6 +226,10 @@ |
| 48 | + #include "ui/ozone/public/ozone_platform.h" |
| 49 | + #endif // BUILDFLAG(IS_OZONE) |
50 | 50 |
|
51 | 51 | +#ifdef __TERMUX__ |
52 | 52 | +#include "sandbox/policy/switches.h" |
|
55 | 55 | base::LazyInstance<ChromeContentGpuClient>::DestructorAtExit |
56 | 56 | g_chrome_content_gpu_client = LAZY_INSTANCE_INITIALIZER; |
57 | 57 | base::LazyInstance<ChromeContentRendererClient>::DestructorAtExit |
58 | | -@@ -1037,6 +1041,14 @@ |
| 58 | +@@ -1061,6 +1065,14 @@ |
59 | 59 | const base::CommandLine& command_line = |
60 | 60 | *base::CommandLine::ForCurrentProcess(); |
61 | 61 |
|
|
72 | 72 | // web security by setting the kWebKitWebSecurityEnabled pref directly. |
73 | 73 | --- a/content/shell/browser/shell_content_browser_client.cc |
74 | 74 | +++ b/content/shell/browser/shell_content_browser_client.cc |
75 | | -@@ -131,6 +131,10 @@ |
| 75 | +@@ -140,6 +140,10 @@ |
76 | 76 | #include "media/mojo/services/media_foundation_preferences.h" |
77 | 77 | #endif // BUILDFLAG(IS_WIN) |
78 | 78 |
|
|
83 | 83 | namespace content { |
84 | 84 |
|
85 | 85 | namespace { |
86 | | -@@ -405,6 +409,9 @@ |
| 86 | +@@ -448,6 +452,9 @@ |
87 | 87 | // to shell_main.cc that it's a browser test. |
88 | 88 | switches::kBrowserTest, |
89 | 89 | #endif |
|
0 commit comments