mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-02-17 20:50:42 +01:00
Update to Chromium version 100.0.4896.75
This commit is contained in:
parent
e775505695
commit
4e5ba66302
@ -7,6 +7,6 @@
|
||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||
|
||||
{
|
||||
'chromium_checkout': 'refs/tags/100.0.4896.60',
|
||||
'chromium_checkout': 'refs/tags/100.0.4896.75',
|
||||
'depot_tools_checkout': '32645dfee9'
|
||||
}
|
||||
|
@ -139,7 +139,7 @@ index 67496d7ab6c50..fa97b9abe6253 100644
|
||||
BrowserFrame(const BrowserFrame&) = delete;
|
||||
BrowserFrame& operator=(const BrowserFrame&) = delete;
|
||||
diff --git chrome/browser/ui/views/frame/browser_view.cc chrome/browser/ui/views/frame/browser_view.cc
|
||||
index d144cbf0fdbe8..7210aafab4bea 100644
|
||||
index adac45808dadb..4309f4acfc219 100644
|
||||
--- chrome/browser/ui/views/frame/browser_view.cc
|
||||
+++ chrome/browser/ui/views/frame/browser_view.cc
|
||||
@@ -297,11 +297,10 @@ using content::WebContents;
|
||||
@ -216,7 +216,7 @@ index d144cbf0fdbe8..7210aafab4bea 100644
|
||||
return frame_->GetFrameView()->ShouldHideTopUIForFullscreen();
|
||||
}
|
||||
|
||||
@@ -2813,7 +2831,8 @@ BrowserView::GetNativeViewHostsForTopControlsSlide() const {
|
||||
@@ -2807,7 +2825,8 @@ BrowserView::GetNativeViewHostsForTopControlsSlide() const {
|
||||
}
|
||||
|
||||
void BrowserView::ReparentTopContainerForEndOfImmersive() {
|
||||
@ -226,7 +226,7 @@ index d144cbf0fdbe8..7210aafab4bea 100644
|
||||
top_container()->DestroyLayer();
|
||||
AddChildViewAt(top_container(), 0);
|
||||
EnsureFocusOrder();
|
||||
@@ -3302,8 +3321,10 @@ void BrowserView::Layout() {
|
||||
@@ -3296,8 +3315,10 @@ void BrowserView::Layout() {
|
||||
|
||||
// TODO(jamescook): Why was this in the middle of layout code?
|
||||
toolbar_->location_bar()->omnibox_view()->SetFocusBehavior(
|
||||
@ -239,7 +239,7 @@ index d144cbf0fdbe8..7210aafab4bea 100644
|
||||
|
||||
// Some of the situations when the BrowserView is laid out are:
|
||||
// - Enter/exit immersive fullscreen mode.
|
||||
@@ -3369,6 +3390,11 @@ void BrowserView::AddedToWidget() {
|
||||
@@ -3363,6 +3384,11 @@ void BrowserView::AddedToWidget() {
|
||||
SetThemeProfileForWindow(GetNativeWindow(), browser_->profile());
|
||||
#endif
|
||||
|
||||
@ -251,7 +251,7 @@ index d144cbf0fdbe8..7210aafab4bea 100644
|
||||
toolbar_->Init();
|
||||
|
||||
// TODO(pbos): Manage this either inside SidePanel or the corresponding button
|
||||
@@ -3421,13 +3447,9 @@ void BrowserView::AddedToWidget() {
|
||||
@@ -3415,13 +3441,9 @@ void BrowserView::AddedToWidget() {
|
||||
|
||||
EnsureFocusOrder();
|
||||
|
||||
@ -267,7 +267,7 @@ index d144cbf0fdbe8..7210aafab4bea 100644
|
||||
using_native_frame_ = frame_->ShouldUseNativeFrame();
|
||||
|
||||
MaybeInitializeWebUITabStrip();
|
||||
@@ -3848,7 +3870,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen,
|
||||
@@ -3842,7 +3864,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen,
|
||||
// Undo our anti-jankiness hacks and force a re-layout.
|
||||
in_process_fullscreen_ = false;
|
||||
ToolbarSizeChanged(false);
|
||||
@ -277,7 +277,7 @@ index d144cbf0fdbe8..7210aafab4bea 100644
|
||||
}
|
||||
|
||||
bool BrowserView::ShouldUseImmersiveFullscreenForUrl(const GURL& url) const {
|
||||
@@ -4175,6 +4198,8 @@ Profile* BrowserView::GetProfile() {
|
||||
@@ -4169,6 +4192,8 @@ Profile* BrowserView::GetProfile() {
|
||||
}
|
||||
|
||||
void BrowserView::UpdateUIForTabFullscreen() {
|
||||
@ -286,7 +286,7 @@ index d144cbf0fdbe8..7210aafab4bea 100644
|
||||
frame()->GetFrameView()->UpdateFullscreenTopUI();
|
||||
}
|
||||
|
||||
@@ -4197,6 +4222,8 @@ void BrowserView::HideDownloadShelf() {
|
||||
@@ -4191,6 +4216,8 @@ void BrowserView::HideDownloadShelf() {
|
||||
}
|
||||
|
||||
bool BrowserView::CanUserExitFullscreen() const {
|
||||
|
Loading…
x
Reference in New Issue
Block a user