mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 137.0.7151.0 (#1453031)
This commit is contained in:
@ -398,10 +398,10 @@ index 42fe73aefe44f..9f150e30336ef 100644
|
||||
handler_path, *database_path, metrics_path, url,
|
||||
GetProcessSimpleAnnotations(), arguments, true, false);
|
||||
diff --git components/crash/core/app/crashpad_win.cc components/crash/core/app/crashpad_win.cc
|
||||
index 0e00d26f79231..fdd2b4bc73f8e 100644
|
||||
index 5b811cbbc5154..e35f8f663b92e 100644
|
||||
--- components/crash/core/app/crashpad_win.cc
|
||||
+++ components/crash/core/app/crashpad_win.cc
|
||||
@@ -37,8 +37,8 @@ void GetPlatformCrashpadAnnotations(
|
||||
@@ -38,8 +38,8 @@ void GetPlatformCrashpadAnnotations(
|
||||
std::wstring product_name, version, special_build, channel_name;
|
||||
crash_reporter_client->GetProductNameAndVersion(
|
||||
exe_file, &product_name, &version, &special_build, &channel_name);
|
||||
@ -412,7 +412,7 @@ index 0e00d26f79231..fdd2b4bc73f8e 100644
|
||||
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
|
||||
// Empty means stable.
|
||||
const bool allow_empty_channel = true;
|
||||
@@ -55,9 +55,11 @@ void GetPlatformCrashpadAnnotations(
|
||||
@@ -56,9 +56,11 @@ void GetPlatformCrashpadAnnotations(
|
||||
if (!special_build.empty())
|
||||
(*annotations)["special"] = base::WideToUTF8(special_build);
|
||||
#if defined(ARCH_CPU_X86)
|
||||
@ -426,29 +426,7 @@ index 0e00d26f79231..fdd2b4bc73f8e 100644
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -72,7 +74,9 @@ bool PlatformCrashpadInitialization(
|
||||
base::FilePath metrics_path; // Only valid in the browser process.
|
||||
|
||||
const char kPipeNameVar[] = "CHROME_CRASHPAD_PIPE_NAME";
|
||||
+#if defined(GOOGLE_CHROME_BUILD)
|
||||
const char kServerUrlVar[] = "CHROME_CRASHPAD_SERVER_URL";
|
||||
+#endif
|
||||
std::unique_ptr<base::Environment> env(base::Environment::Create());
|
||||
|
||||
CrashReporterClient* crash_reporter_client = GetCrashReporterClient();
|
||||
@@ -95,9 +99,11 @@ bool PlatformCrashpadInitialization(
|
||||
|
||||
std::string url = crash_reporter_client->GetUploadUrl();
|
||||
|
||||
+#if defined(GOOGLE_CHROME_BUILD)
|
||||
// Allow the crash server to be overridden for testing. If the variable
|
||||
// isn't present in the environment then the default URL will remain.
|
||||
env->GetVar(kServerUrlVar, &url);
|
||||
+#endif
|
||||
|
||||
base::FilePath exe_file(exe_path);
|
||||
if (exe_file.empty()) {
|
||||
@@ -108,13 +114,14 @@ bool PlatformCrashpadInitialization(
|
||||
@@ -112,13 +114,14 @@ bool PlatformCrashpadInitialization(
|
||||
exe_file = base::FilePath(exe_file_path);
|
||||
}
|
||||
|
||||
@ -468,7 +446,7 @@ index 0e00d26f79231..fdd2b4bc73f8e 100644
|
||||
if (!user_data_dir.empty()) {
|
||||
start_arguments.push_back(std::string("--user-data-dir=") +
|
||||
user_data_dir);
|
||||
@@ -124,9 +131,12 @@ bool PlatformCrashpadInitialization(
|
||||
@@ -128,9 +131,12 @@ bool PlatformCrashpadInitialization(
|
||||
app_launch_prefetch::SubprocessType::kCrashpad)));
|
||||
} else {
|
||||
base::FilePath exe_dir = exe_file.DirName();
|
||||
|
Reference in New Issue
Block a user