mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-02-02 20:26:59 +01:00
Update to Chromium version 115.0.5790.171
This commit is contained in:
parent
a61da9b80c
commit
fcd259c3e0
@ -7,6 +7,6 @@
|
||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||
|
||||
{
|
||||
'chromium_checkout': 'refs/tags/115.0.5790.114',
|
||||
'chromium_checkout': 'refs/tags/115.0.5790.171',
|
||||
'depot_tools_checkout': 'df2f11113c'
|
||||
}
|
||||
|
@ -13,10 +13,10 @@ index 9d9c17ffd6474..4eb79c65369af 100644
|
||||
};
|
||||
|
||||
diff --git content/public/browser/webui_config_map.h content/public/browser/webui_config_map.h
|
||||
index 19777632921fc..a22db4c49fd84 100644
|
||||
index a80034506bf45..4bda477df0558 100644
|
||||
--- content/public/browser/webui_config_map.h
|
||||
+++ content/public/browser/webui_config_map.h
|
||||
@@ -60,6 +60,10 @@ class CONTENT_EXPORT WebUIConfigMap {
|
||||
@@ -61,6 +61,10 @@ class CONTENT_EXPORT WebUIConfigMap {
|
||||
// Returns the size of the map, i.e. how many WebUIConfigs are registered.
|
||||
size_t GetSizeForTesting() { return configs_map_.size(); }
|
||||
|
||||
|
@ -235,7 +235,7 @@ index 789d147f0b305..64a33cce013c5 100644
|
||||
+#endif
|
||||
}
|
||||
diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
|
||||
index fbe839fd4259d..fcca09183776d 100644
|
||||
index f5c614464662c..1a273805c05eb 100644
|
||||
--- chrome/browser/chrome_content_browser_client.cc
|
||||
+++ chrome/browser/chrome_content_browser_client.cc
|
||||
@@ -41,6 +41,7 @@
|
||||
|
Loading…
x
Reference in New Issue
Block a user