mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 95.0.4638.17
This commit is contained in:
committed by
Marshall Greenblatt
parent
9a6c627c4b
commit
263160aa14
@@ -7,6 +7,6 @@
|
||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||
|
||||
{
|
||||
'chromium_checkout': 'refs/tags/95.0.4638.10',
|
||||
'chromium_checkout': 'refs/tags/95.0.4638.17',
|
||||
'depot_tools_checkout': 'eff810e93d'
|
||||
}
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git chrome/browser/renderer_context_menu/render_view_context_menu.cc chrome/browser/renderer_context_menu/render_view_context_menu.cc
|
||||
index e17b94b67104f..22be126f0c5a4 100644
|
||||
index 24d40c76da899..a05d78416b7eb 100644
|
||||
--- chrome/browser/renderer_context_menu/render_view_context_menu.cc
|
||||
+++ chrome/browser/renderer_context_menu/render_view_context_menu.cc
|
||||
@@ -283,6 +283,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
|
||||
index 946ce7804a93d..2dfdde6a04afc 100644
|
||||
index a6161392b2698..bab517eeb3a9e 100644
|
||||
--- chrome/browser/ui/BUILD.gn
|
||||
+++ chrome/browser/ui/BUILD.gn
|
||||
@@ -11,6 +11,7 @@ import("//build/config/features.gni")
|
||||
@@ -29,7 +29,7 @@ index 946ce7804a93d..2dfdde6a04afc 100644
|
||||
"//chrome:extra_resources",
|
||||
"//chrome:resources",
|
||||
"//chrome:strings",
|
||||
@@ -4988,6 +4994,7 @@ static_library("ui") {
|
||||
@@ -4990,6 +4996,7 @@ static_library("ui") {
|
||||
if (enable_basic_printing) {
|
||||
deps += [
|
||||
"//components/printing/browser",
|
||||
|
@@ -113,7 +113,7 @@ index b6c4eee4c9d1a..c8158ff856167 100644
|
||||
}
|
||||
|
||||
diff --git chrome/browser/profiles/profile_manager.h chrome/browser/profiles/profile_manager.h
|
||||
index c4d9b563a2bc1..13de953c75ad2 100644
|
||||
index 126faf0da6c27..b9acfa7144650 100644
|
||||
--- chrome/browser/profiles/profile_manager.h
|
||||
+++ chrome/browser/profiles/profile_manager.h
|
||||
@@ -119,7 +119,7 @@ class ProfileManager : public Profile::Delegate {
|
||||
|
@@ -120,7 +120,7 @@ index e06cd6c3d83db..1f7da7cf79979 100644
|
||||
|
||||
// Initialize the frame (creates the underlying native window).
|
||||
diff --git chrome/browser/ui/views/frame/browser_view.cc chrome/browser/ui/views/frame/browser_view.cc
|
||||
index 63922bed46718..e8dca023a8150 100644
|
||||
index e7081ab3ec3e8..eb533496ef91c 100644
|
||||
--- chrome/browser/ui/views/frame/browser_view.cc
|
||||
+++ chrome/browser/ui/views/frame/browser_view.cc
|
||||
@@ -284,11 +284,10 @@ using content::WebContents;
|
||||
@@ -188,7 +188,7 @@ index 63922bed46718..e8dca023a8150 100644
|
||||
|
||||
contents_separator_ =
|
||||
top_container_->AddChildView(std::make_unique<ContentsSeparator>());
|
||||
@@ -1465,6 +1481,8 @@ bool BrowserView::ShouldHideUIForFullscreen() const {
|
||||
@@ -1472,6 +1488,8 @@ bool BrowserView::ShouldHideUIForFullscreen() const {
|
||||
if (immersive_mode_controller_->IsEnabled())
|
||||
return false;
|
||||
|
||||
@@ -197,7 +197,7 @@ index 63922bed46718..e8dca023a8150 100644
|
||||
return frame_->GetFrameView()->ShouldHideTopUIForFullscreen();
|
||||
}
|
||||
|
||||
@@ -2538,7 +2556,8 @@ BrowserView::GetNativeViewHostsForTopControlsSlide() const {
|
||||
@@ -2545,7 +2563,8 @@ BrowserView::GetNativeViewHostsForTopControlsSlide() const {
|
||||
}
|
||||
|
||||
void BrowserView::ReparentTopContainerForEndOfImmersive() {
|
||||
@@ -207,7 +207,7 @@ index 63922bed46718..e8dca023a8150 100644
|
||||
top_container()->DestroyLayer();
|
||||
AddChildViewAt(top_container(), 0);
|
||||
EnsureFocusOrder();
|
||||
@@ -2990,8 +3009,10 @@ void BrowserView::Layout() {
|
||||
@@ -2997,8 +3016,10 @@ void BrowserView::Layout() {
|
||||
|
||||
// TODO(jamescook): Why was this in the middle of layout code?
|
||||
toolbar_->location_bar()->omnibox_view()->SetFocusBehavior(
|
||||
@@ -220,7 +220,7 @@ index 63922bed46718..e8dca023a8150 100644
|
||||
|
||||
// Some of the situations when the BrowserView is laid out are:
|
||||
// - Enter/exit immersive fullscreen mode.
|
||||
@@ -3054,6 +3075,11 @@ void BrowserView::AddedToWidget() {
|
||||
@@ -3061,6 +3082,11 @@ void BrowserView::AddedToWidget() {
|
||||
SetThemeProfileForWindow(GetNativeWindow(), browser_->profile());
|
||||
#endif
|
||||
|
||||
@@ -232,7 +232,7 @@ index 63922bed46718..e8dca023a8150 100644
|
||||
toolbar_->Init();
|
||||
|
||||
#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
@@ -3089,13 +3115,9 @@ void BrowserView::AddedToWidget() {
|
||||
@@ -3096,13 +3122,9 @@ void BrowserView::AddedToWidget() {
|
||||
|
||||
EnsureFocusOrder();
|
||||
|
||||
@@ -368,7 +368,7 @@ index 140c0df49ea46..7d4ac470dcc9a 100644
|
||||
}
|
||||
|
||||
diff --git chrome/browser/ui/views/toolbar/toolbar_view.cc chrome/browser/ui/views/toolbar/toolbar_view.cc
|
||||
index f290b0d5ea521..31ffa7e61e69f 100644
|
||||
index aeda031a86169..229b12b48f975 100644
|
||||
--- chrome/browser/ui/views/toolbar/toolbar_view.cc
|
||||
+++ chrome/browser/ui/views/toolbar/toolbar_view.cc
|
||||
@@ -162,12 +162,13 @@ auto& GetViewCommandMap() {
|
||||
@@ -397,7 +397,7 @@ index f290b0d5ea521..31ffa7e61e69f 100644
|
||||
size_animation_.Reset(1);
|
||||
|
||||
diff --git chrome/browser/ui/views/toolbar/toolbar_view.h chrome/browser/ui/views/toolbar/toolbar_view.h
|
||||
index ec77ff5a0611a..0c8d95120d0c5 100644
|
||||
index 1da8e4f42dc99..3c86aad64f014 100644
|
||||
--- chrome/browser/ui/views/toolbar/toolbar_view.h
|
||||
+++ chrome/browser/ui/views/toolbar/toolbar_view.h
|
||||
@@ -91,7 +91,8 @@ class ToolbarView : public views::AccessiblePaneView,
|
||||
|
@@ -348,10 +348,10 @@ index 173952d4545d5..2f311b988c380 100644
|
||||
&mime_type);
|
||||
if (!found)
|
||||
diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc
|
||||
index 52c02371bf373..3cd441e5d9a0d 100644
|
||||
index c0a004136c09c..5fbf7092b07ad 100644
|
||||
--- content/renderer/render_thread_impl.cc
|
||||
+++ content/renderer/render_thread_impl.cc
|
||||
@@ -610,6 +610,8 @@ void RenderThreadImpl::Init() {
|
||||
@@ -616,6 +616,8 @@ void RenderThreadImpl::Init() {
|
||||
GetContentClient()->renderer()->CreateURLLoaderThrottleProvider(
|
||||
blink::URLLoaderThrottleProviderType::kFrame);
|
||||
|
||||
|
@@ -44,7 +44,7 @@ index 463e3e5e73419..97aaf0da2b9a5 100644
|
||||
|
||||
DocumentInit& DocumentInit::WithTypeFrom(const String& mime_type) {
|
||||
diff --git third_party/blink/renderer/core/frame/local_frame.cc third_party/blink/renderer/core/frame/local_frame.cc
|
||||
index b3bc13e67987a..da2f32c4a8684 100644
|
||||
index 03454b10d7020..0e3c66a76fb38 100644
|
||||
--- third_party/blink/renderer/core/frame/local_frame.cc
|
||||
+++ third_party/blink/renderer/core/frame/local_frame.cc
|
||||
@@ -1853,7 +1853,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd
|
||||
index adf1373005390..b34518a06053b 100644
|
||||
index 0b1ae29ed8f18..918f42f2f3d69 100644
|
||||
--- chrome/app/generated_resources.grd
|
||||
+++ chrome/app/generated_resources.grd
|
||||
@@ -5327,7 +5327,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
|
||||
|
Reference in New Issue
Block a user