mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 108.0.5359.0 (#1058933)
This commit is contained in:
@ -1,5 +1,5 @@
|
||||
diff --git chrome/browser/ui/browser_command_controller.cc chrome/browser/ui/browser_command_controller.cc
|
||||
index 6eece67e8548a..eb78e5157eec8 100644
|
||||
index 56762e4de844e..ec026e5b69cc7 100644
|
||||
--- chrome/browser/ui/browser_command_controller.cc
|
||||
+++ chrome/browser/ui/browser_command_controller.cc
|
||||
@@ -382,8 +382,10 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
|
||||
@ -28,7 +28,7 @@ index 6eece67e8548a..eb78e5157eec8 100644
|
||||
// The order of commands in this switch statement must match the function
|
||||
// declaration order in browser.h!
|
||||
switch (id) {
|
||||
@@ -1043,11 +1052,13 @@ void BrowserCommandController::TabRestoreServiceLoaded(
|
||||
@@ -1044,11 +1053,13 @@ void BrowserCommandController::TabRestoreServiceLoaded(
|
||||
// BrowserCommandController, private:
|
||||
|
||||
bool BrowserCommandController::IsShowingMainUI() {
|
||||
@ -179,10 +179,10 @@ index 195674a56169c..bee591ec8f2f3 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 a8e5cd8826ca4..0b958e49730d4 100644
|
||||
index ed0b1e375c5e4..0274783e07ad9 100644
|
||||
--- chrome/browser/ui/views/frame/browser_view.cc
|
||||
+++ chrome/browser/ui/views/frame/browser_view.cc
|
||||
@@ -305,11 +305,10 @@ using content::NativeWebKeyboardEvent;
|
||||
@@ -309,11 +309,10 @@ using content::NativeWebKeyboardEvent;
|
||||
using content::WebContents;
|
||||
using web_modal::WebContentsModalDialogHost;
|
||||
|
||||
@ -197,7 +197,7 @@ index a8e5cd8826ca4..0b958e49730d4 100644
|
||||
|
||||
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
// UMA histograms that record animation smoothness for tab loading animation.
|
||||
@@ -802,11 +801,22 @@ class BrowserView::SidePanelVisibilityController : public views::ViewObserver {
|
||||
@@ -806,11 +805,22 @@ class BrowserView::SidePanelVisibilityController : public views::ViewObserver {
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// BrowserView, public:
|
||||
|
||||
@ -221,7 +221,7 @@ index a8e5cd8826ca4..0b958e49730d4 100644
|
||||
SetShowIcon(
|
||||
::ShouldShowWindowIcon(browser_.get(), AppUsesWindowControlsOverlay()));
|
||||
|
||||
@@ -848,7 +858,6 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
|
||||
@@ -852,7 +862,6 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
|
||||
}
|
||||
|
||||
browser_->tab_strip_model()->AddObserver(this);
|
||||
@ -229,7 +229,7 @@ index a8e5cd8826ca4..0b958e49730d4 100644
|
||||
|
||||
// Top container holds tab strip region and toolbar and lives at the front of
|
||||
// the view hierarchy.
|
||||
@@ -894,8 +903,15 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
|
||||
@@ -898,8 +907,15 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
|
||||
contents_container->SetLayoutManager(std::make_unique<ContentsLayoutManager>(
|
||||
devtools_web_view_, contents_web_view_));
|
||||
|
||||
@ -247,7 +247,7 @@ index a8e5cd8826ca4..0b958e49730d4 100644
|
||||
|
||||
contents_separator_ =
|
||||
top_container_->AddChildView(std::make_unique<ContentsSeparator>());
|
||||
@@ -1841,6 +1857,8 @@ bool BrowserView::ShouldHideUIForFullscreen() const {
|
||||
@@ -1877,6 +1893,8 @@ bool BrowserView::ShouldHideUIForFullscreen() const {
|
||||
if (immersive_mode_controller_->IsEnabled())
|
||||
return false;
|
||||
|
||||
@ -256,7 +256,17 @@ index a8e5cd8826ca4..0b958e49730d4 100644
|
||||
return frame_->GetFrameView()->ShouldHideTopUIForFullscreen();
|
||||
}
|
||||
|
||||
@@ -3202,7 +3220,8 @@ void BrowserView::ReparentTopContainerForEndOfImmersive() {
|
||||
@@ -2755,7 +2773,8 @@ DownloadShelf* BrowserView::GetDownloadShelf() {
|
||||
}
|
||||
|
||||
DownloadBubbleUIController* BrowserView::GetDownloadBubbleUIController() {
|
||||
- DCHECK(toolbar_button_provider_);
|
||||
+ if (!toolbar_button_provider_)
|
||||
+ return nullptr;
|
||||
if (auto* download_button = toolbar_button_provider_->GetDownloadButton())
|
||||
return download_button->bubble_controller();
|
||||
return nullptr;
|
||||
@@ -3247,7 +3266,8 @@ void BrowserView::ReparentTopContainerForEndOfImmersive() {
|
||||
if (top_container()->parent() == this)
|
||||
return;
|
||||
|
||||
@ -266,7 +276,7 @@ index a8e5cd8826ca4..0b958e49730d4 100644
|
||||
top_container()->DestroyLayer();
|
||||
AddChildViewAt(top_container(), 0);
|
||||
EnsureFocusOrder();
|
||||
@@ -3747,8 +3766,10 @@ void BrowserView::Layout() {
|
||||
@@ -3792,8 +3812,10 @@ void BrowserView::Layout() {
|
||||
|
||||
// TODO(jamescook): Why was this in the middle of layout code?
|
||||
toolbar_->location_bar()->omnibox_view()->SetFocusBehavior(
|
||||
@ -279,7 +289,7 @@ index a8e5cd8826ca4..0b958e49730d4 100644
|
||||
|
||||
// Some of the situations when the BrowserView is laid out are:
|
||||
// - Enter/exit immersive fullscreen mode.
|
||||
@@ -3814,6 +3835,11 @@ void BrowserView::AddedToWidget() {
|
||||
@@ -3859,6 +3881,11 @@ void BrowserView::AddedToWidget() {
|
||||
SetThemeProfileForWindow(GetNativeWindow(), browser_->profile());
|
||||
#endif
|
||||
|
||||
@ -291,7 +301,7 @@ index a8e5cd8826ca4..0b958e49730d4 100644
|
||||
toolbar_->Init();
|
||||
|
||||
// TODO(pbos): Manage this either inside SidePanel or the corresponding button
|
||||
@@ -3874,13 +3900,9 @@ void BrowserView::AddedToWidget() {
|
||||
@@ -3919,13 +3946,9 @@ void BrowserView::AddedToWidget() {
|
||||
|
||||
EnsureFocusOrder();
|
||||
|
||||
@ -307,7 +317,7 @@ index a8e5cd8826ca4..0b958e49730d4 100644
|
||||
using_native_frame_ = frame_->ShouldUseNativeFrame();
|
||||
|
||||
MaybeInitializeWebUITabStrip();
|
||||
@@ -4296,7 +4318,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen,
|
||||
@@ -4341,7 +4364,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen,
|
||||
// Undo our anti-jankiness hacks and force a re-layout.
|
||||
in_process_fullscreen_ = false;
|
||||
ToolbarSizeChanged(false);
|
||||
@ -317,7 +327,7 @@ index a8e5cd8826ca4..0b958e49730d4 100644
|
||||
}
|
||||
|
||||
bool BrowserView::ShouldUseImmersiveFullscreenForUrl(const GURL& url) const {
|
||||
@@ -4638,6 +4661,8 @@ Profile* BrowserView::GetProfile() {
|
||||
@@ -4683,6 +4707,8 @@ Profile* BrowserView::GetProfile() {
|
||||
}
|
||||
|
||||
void BrowserView::UpdateUIForTabFullscreen() {
|
||||
@ -326,7 +336,7 @@ index a8e5cd8826ca4..0b958e49730d4 100644
|
||||
frame()->GetFrameView()->UpdateFullscreenTopUI();
|
||||
}
|
||||
|
||||
@@ -4660,6 +4685,8 @@ void BrowserView::HideDownloadShelf() {
|
||||
@@ -4705,6 +4731,8 @@ void BrowserView::HideDownloadShelf() {
|
||||
}
|
||||
|
||||
bool BrowserView::CanUserExitFullscreen() const {
|
||||
@ -336,10 +346,10 @@ index a8e5cd8826ca4..0b958e49730d4 100644
|
||||
}
|
||||
|
||||
diff --git chrome/browser/ui/views/frame/browser_view.h chrome/browser/ui/views/frame/browser_view.h
|
||||
index 0dfde39f4bd1f..dc9ba028c22bb 100644
|
||||
index 7813973b71372..c223beb92a102 100644
|
||||
--- chrome/browser/ui/views/frame/browser_view.h
|
||||
+++ chrome/browser/ui/views/frame/browser_view.h
|
||||
@@ -130,11 +130,16 @@ class BrowserView : public BrowserWindow,
|
||||
@@ -131,11 +131,16 @@ class BrowserView : public BrowserWindow,
|
||||
public webapps::AppBannerManager::Observer {
|
||||
public:
|
||||
METADATA_HEADER(BrowserView);
|
||||
@ -356,9 +366,9 @@ index 0dfde39f4bd1f..dc9ba028c22bb 100644
|
||||
void set_frame(BrowserFrame* frame) { frame_ = frame; }
|
||||
BrowserFrame* frame() const { return frame_; }
|
||||
|
||||
@@ -791,6 +796,12 @@ class BrowserView : public BrowserWindow,
|
||||
return should_show_window_controls_overlay_toggle_;
|
||||
}
|
||||
@@ -798,6 +803,12 @@ class BrowserView : public BrowserWindow,
|
||||
void SetLoadingAnimationStateChangeClosureForTesting(
|
||||
base::OnceClosure closure);
|
||||
|
||||
+ protected:
|
||||
+ virtual ToolbarView* OverrideCreateToolbar(Browser* browser,
|
||||
@ -465,10 +475,10 @@ index 57d5e9f7b4e3c..da7b2d14bae49 100644
|
||||
}
|
||||
|
||||
diff --git chrome/browser/ui/views/toolbar/toolbar_view.cc chrome/browser/ui/views/toolbar/toolbar_view.cc
|
||||
index 73869775288dc..524f32d3ae877 100644
|
||||
index 89ea1bf57ef43..22c39b3c6566d 100644
|
||||
--- chrome/browser/ui/views/toolbar/toolbar_view.cc
|
||||
+++ chrome/browser/ui/views/toolbar/toolbar_view.cc
|
||||
@@ -170,12 +170,13 @@ auto& GetViewCommandMap() {
|
||||
@@ -171,12 +171,13 @@ auto& GetViewCommandMap() {
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
// ToolbarView, public:
|
||||
|
||||
@ -484,7 +494,7 @@ index 73869775288dc..524f32d3ae877 100644
|
||||
SetID(VIEW_ID_TOOLBAR);
|
||||
|
||||
UpgradeDetector::GetInstance()->AddObserver(this);
|
||||
@@ -210,7 +211,7 @@ void ToolbarView::Init() {
|
||||
@@ -211,7 +212,7 @@ void ToolbarView::Init() {
|
||||
#endif
|
||||
auto location_bar = std::make_unique<LocationBarView>(
|
||||
browser_, browser_->profile(), browser_->command_controller(), this,
|
||||
@ -494,7 +504,7 @@ index 73869775288dc..524f32d3ae877 100644
|
||||
size_animation_.Reset(1);
|
||||
|
||||
diff --git chrome/browser/ui/views/toolbar/toolbar_view.h chrome/browser/ui/views/toolbar/toolbar_view.h
|
||||
index e597548896482..b9985ed50a2e3 100644
|
||||
index da32d80ee4f08..8a5e1af098414 100644
|
||||
--- chrome/browser/ui/views/toolbar/toolbar_view.h
|
||||
+++ chrome/browser/ui/views/toolbar/toolbar_view.h
|
||||
@@ -95,7 +95,8 @@ class ToolbarView : public views::AccessiblePaneView,
|
||||
|
Reference in New Issue
Block a user