mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 135.0.7049.0 (#1427262)
This commit is contained in:
@ -124,7 +124,7 @@ index 2f8162d7491d1..b00f0d5bf26ae 100644
|
||||
// Factory for the creating refs in callbacks.
|
||||
base::WeakPtrFactory<VersionHandler> weak_ptr_factory_{this};
|
||||
diff --git chrome/browser/ui/webui/version/version_ui.cc chrome/browser/ui/webui/version/version_ui.cc
|
||||
index 7919a35b990e8..67cbd0aa3360e 100644
|
||||
index 04741c513f541..90997d537aede 100644
|
||||
--- chrome/browser/ui/webui/version/version_ui.cc
|
||||
+++ chrome/browser/ui/webui/version/version_ui.cc
|
||||
@@ -16,6 +16,7 @@
|
||||
@ -135,7 +135,7 @@ index 7919a35b990e8..67cbd0aa3360e 100644
|
||||
#include "chrome/browser/browser_process_impl.h"
|
||||
#include "chrome/browser/profiles/profile.h"
|
||||
#include "chrome/browser/ui/webui/version/version_handler.h"
|
||||
@@ -63,6 +64,10 @@
|
||||
@@ -62,6 +63,10 @@
|
||||
#include "chrome/browser/ui/webui/version/version_util_win.h"
|
||||
#endif
|
||||
|
||||
@ -146,7 +146,7 @@ index 7919a35b990e8..67cbd0aa3360e 100644
|
||||
using content::WebUIDataSource;
|
||||
|
||||
namespace {
|
||||
@@ -83,6 +88,10 @@ void CreateAndAddVersionUIDataSource(Profile* profile) {
|
||||
@@ -82,6 +87,10 @@ void CreateAndAddVersionUIDataSource(Profile* profile) {
|
||||
{version_ui::kCommandLineName, IDS_VERSION_UI_COMMAND_LINE},
|
||||
{version_ui::kExecutablePathName, IDS_VERSION_UI_EXECUTABLE_PATH},
|
||||
{version_ui::kProfilePathName, IDS_VERSION_UI_PROFILE_PATH},
|
||||
@ -157,7 +157,7 @@ index 7919a35b990e8..67cbd0aa3360e 100644
|
||||
{version_ui::kVariationsName, IDS_VERSION_UI_VARIATIONS},
|
||||
{version_ui::kVariationsCmdName, IDS_VERSION_UI_VARIATIONS_CMD},
|
||||
{version_ui::kCopyVariationsLabel, IDS_VERSION_UI_COPY_VARIATIONS_LABEL},
|
||||
@@ -114,6 +123,10 @@ void CreateAndAddVersionUIDataSource(Profile* profile) {
|
||||
@@ -113,6 +122,10 @@ void CreateAndAddVersionUIDataSource(Profile* profile) {
|
||||
IDR_PRODUCT_LOGO_WHITE);
|
||||
#endif // BUILDFLAG(IS_ANDROID)
|
||||
html_source->SetDefaultResource(IDR_VERSION_UI_ABOUT_VERSION_HTML);
|
||||
@ -168,13 +168,13 @@ index 7919a35b990e8..67cbd0aa3360e 100644
|
||||
}
|
||||
|
||||
std::string GetProductModifier() {
|
||||
@@ -231,6 +244,10 @@ void VersionUI::AddVersionDetailStrings(content::WebUIDataSource* html_source) {
|
||||
@@ -229,6 +242,10 @@ void VersionUI::AddVersionDetailStrings(content::WebUIDataSource* html_source) {
|
||||
// blank.
|
||||
html_source->AddString(version_ui::kExecutablePath, std::string());
|
||||
html_source->AddString(version_ui::kProfilePath, std::string());
|
||||
html_source->AddString(version_ui::kExecutablePath, std::string_view());
|
||||
html_source->AddString(version_ui::kProfilePath, std::string_view());
|
||||
+#if BUILDFLAG(ENABLE_CEF)
|
||||
+ html_source->AddString(version_ui::kModulePath, std::string());
|
||||
+ html_source->AddString(version_ui::kUserDataPath, std::string());
|
||||
+ html_source->AddString(version_ui::kModulePath, std::string_view());
|
||||
+ html_source->AddString(version_ui::kUserDataPath, std::string_view());
|
||||
+#endif
|
||||
|
||||
#if BUILDFLAG(IS_MAC)
|
||||
|
Reference in New Issue
Block a user