Update to Chromium version 105.0.5195.0 (#1027018)

This commit is contained in:
Marshall Greenblatt
2022-07-25 13:49:32 -04:00
parent e9f29ab3d6
commit 9af494d36c
72 changed files with 811 additions and 686 deletions

View File

@@ -1,8 +1,8 @@
diff --git chrome/browser/ui/browser_command_controller.cc chrome/browser/ui/browser_command_controller.cc
index 4013ab3ce380b..3ea8492f4c977 100644
index 20fcf6172c577..d34843570fa35 100644
--- chrome/browser/ui/browser_command_controller.cc
+++ chrome/browser/ui/browser_command_controller.cc
@@ -415,8 +415,10 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
@@ -412,8 +412,10 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
// CommandUpdaterDelegate and CommandUpdater declare this function so we
// choose to not implement CommandUpdaterDelegate inside this class and
// therefore command_updater_ doesn't have the delegate set).
@@ -14,7 +14,7 @@ index 4013ab3ce380b..3ea8492f4c977 100644
// No commands are enabled if there is not yet any selected tab.
// TODO(pkasting): It seems like we should not need this, because either
@@ -431,6 +433,13 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
@@ -428,6 +430,13 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
DCHECK(command_updater_.IsCommandEnabled(id))
<< "Invalid/disabled command " << id;
@@ -28,7 +28,7 @@ index 4013ab3ce380b..3ea8492f4c977 100644
// The order of commands in this switch statement must match the function
// declaration order in browser.h!
switch (id) {
@@ -1076,11 +1085,13 @@ void BrowserCommandController::TabRestoreServiceLoaded(
@@ -1073,11 +1082,13 @@ void BrowserCommandController::TabRestoreServiceLoaded(
// BrowserCommandController, private:
bool BrowserCommandController::IsShowingMainUI() {
@@ -45,7 +45,7 @@ index 4013ab3ce380b..3ea8492f4c977 100644
bool BrowserCommandController::IsWebAppOrCustomTab() const {
diff --git chrome/browser/ui/views/frame/browser_frame.cc chrome/browser/ui/views/frame/browser_frame.cc
index 95d3053a5af11..b726ea28700de 100644
index f3cc4af3bdae4..442eb363709d2 100644
--- chrome/browser/ui/views/frame/browser_frame.cc
+++ chrome/browser/ui/views/frame/browser_frame.cc
@@ -74,15 +74,23 @@ bool IsUsingGtkTheme(Profile* profile) {
@@ -180,10 +180,10 @@ index 9bd586697dece..80ef1f08cb463 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 a6f5515c7259d..51da31a2afe91 100644
index 4d7516e88120d..fe0d815b0764a 100644
--- chrome/browser/ui/views/frame/browser_view.cc
+++ chrome/browser/ui/views/frame/browser_view.cc
@@ -302,11 +302,10 @@ using content::NativeWebKeyboardEvent;
@@ -304,11 +304,10 @@ using content::NativeWebKeyboardEvent;
using content::WebContents;
using web_modal::WebContentsModalDialogHost;
@@ -198,7 +198,7 @@ index a6f5515c7259d..51da31a2afe91 100644
#if BUILDFLAG(IS_CHROMEOS_ASH)
// UMA histograms that record animation smoothness for tab loading animation.
@@ -793,11 +792,22 @@ class BrowserView::SidePanelVisibilityController : public views::ViewObserver {
@@ -799,11 +798,22 @@ class BrowserView::SidePanelVisibilityController : public views::ViewObserver {
///////////////////////////////////////////////////////////////////////////////
// BrowserView, public:
@@ -222,7 +222,7 @@ index a6f5515c7259d..51da31a2afe91 100644
SetShowIcon(
::ShouldShowWindowIcon(browser_.get(), AppUsesWindowControlsOverlay()));
@@ -839,7 +849,6 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
@@ -845,7 +855,6 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
}
browser_->tab_strip_model()->AddObserver(this);
@@ -230,7 +230,7 @@ index a6f5515c7259d..51da31a2afe91 100644
// Top container holds tab strip region and toolbar and lives at the front of
// the view hierarchy.
@@ -882,8 +891,15 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
@@ -890,8 +899,15 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
contents_container->SetLayoutManager(std::make_unique<ContentsLayoutManager>(
devtools_web_view_, contents_web_view_));
@@ -248,7 +248,7 @@ index a6f5515c7259d..51da31a2afe91 100644
contents_separator_ =
top_container_->AddChildView(std::make_unique<ContentsSeparator>());
@@ -1785,6 +1801,8 @@ bool BrowserView::ShouldHideUIForFullscreen() const {
@@ -1802,6 +1818,8 @@ bool BrowserView::ShouldHideUIForFullscreen() const {
if (immersive_mode_controller_->IsEnabled())
return false;
@@ -257,7 +257,7 @@ index a6f5515c7259d..51da31a2afe91 100644
return frame_->GetFrameView()->ShouldHideTopUIForFullscreen();
}
@@ -3037,7 +3055,8 @@ BrowserView::GetNativeViewHostsForTopControlsSlide() const {
@@ -3064,7 +3082,8 @@ BrowserView::GetNativeViewHostsForTopControlsSlide() const {
}
void BrowserView::ReparentTopContainerForEndOfImmersive() {
@@ -267,7 +267,7 @@ index a6f5515c7259d..51da31a2afe91 100644
top_container()->DestroyLayer();
AddChildViewAt(top_container(), 0);
EnsureFocusOrder();
@@ -3549,8 +3568,10 @@ void BrowserView::Layout() {
@@ -3576,8 +3595,10 @@ void BrowserView::Layout() {
// TODO(jamescook): Why was this in the middle of layout code?
toolbar_->location_bar()->omnibox_view()->SetFocusBehavior(
@@ -280,7 +280,7 @@ index a6f5515c7259d..51da31a2afe91 100644
// Some of the situations when the BrowserView is laid out are:
// - Enter/exit immersive fullscreen mode.
@@ -3616,6 +3637,11 @@ void BrowserView::AddedToWidget() {
@@ -3643,6 +3664,11 @@ void BrowserView::AddedToWidget() {
SetThemeProfileForWindow(GetNativeWindow(), browser_->profile());
#endif
@@ -292,7 +292,7 @@ index a6f5515c7259d..51da31a2afe91 100644
toolbar_->Init();
// TODO(pbos): Manage this either inside SidePanel or the corresponding button
@@ -3677,13 +3703,9 @@ void BrowserView::AddedToWidget() {
@@ -3704,13 +3730,9 @@ void BrowserView::AddedToWidget() {
EnsureFocusOrder();
@@ -308,7 +308,7 @@ index a6f5515c7259d..51da31a2afe91 100644
using_native_frame_ = frame_->ShouldUseNativeFrame();
MaybeInitializeWebUITabStrip();
@@ -4091,7 +4113,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen,
@@ -4118,7 +4140,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen,
// Undo our anti-jankiness hacks and force a re-layout.
in_process_fullscreen_ = false;
ToolbarSizeChanged(false);
@@ -318,7 +318,7 @@ index a6f5515c7259d..51da31a2afe91 100644
}
bool BrowserView::ShouldUseImmersiveFullscreenForUrl(const GURL& url) const {
@@ -4406,6 +4429,8 @@ Profile* BrowserView::GetProfile() {
@@ -4433,6 +4456,8 @@ Profile* BrowserView::GetProfile() {
}
void BrowserView::UpdateUIForTabFullscreen() {
@@ -327,7 +327,7 @@ index a6f5515c7259d..51da31a2afe91 100644
frame()->GetFrameView()->UpdateFullscreenTopUI();
}
@@ -4428,6 +4453,8 @@ void BrowserView::HideDownloadShelf() {
@@ -4455,6 +4480,8 @@ void BrowserView::HideDownloadShelf() {
}
bool BrowserView::CanUserExitFullscreen() const {
@@ -337,7 +337,7 @@ index a6f5515c7259d..51da31a2afe91 100644
}
diff --git chrome/browser/ui/views/frame/browser_view.h chrome/browser/ui/views/frame/browser_view.h
index 0fad4aa723c84..077df40dc4762 100644
index fb4fa467f9d2a..cbf3d48166d8f 100644
--- chrome/browser/ui/views/frame/browser_view.h
+++ chrome/browser/ui/views/frame/browser_view.h
@@ -125,11 +125,16 @@ class BrowserView : public BrowserWindow,
@@ -357,7 +357,7 @@ index 0fad4aa723c84..077df40dc4762 100644
void set_frame(BrowserFrame* frame) { frame_ = frame; }
BrowserFrame* frame() const { return frame_; }
@@ -742,6 +747,12 @@ class BrowserView : public BrowserWindow,
@@ -747,6 +752,12 @@ class BrowserView : public BrowserWindow,
// aligned side panels.
void RightAlignedSidePanelWasClosed();
@@ -371,10 +371,10 @@ index 0fad4aa723c84..077df40dc4762 100644
// Do not friend BrowserViewLayout. Use the BrowserViewLayoutDelegate
// interface to keep these two classes decoupled and testable.
diff --git chrome/browser/ui/views/frame/browser_view_layout.cc chrome/browser/ui/views/frame/browser_view_layout.cc
index 1db5f517e7bfb..981b4321f6aa9 100644
index 432a9f31b6558..0bb23e8caa77c 100644
--- chrome/browser/ui/views/frame/browser_view_layout.cc
+++ chrome/browser/ui/views/frame/browser_view_layout.cc
@@ -42,6 +42,10 @@
@@ -45,6 +45,10 @@
#include "ui/views/widget/widget.h"
#include "ui/views/window/client_view.h"
@@ -385,7 +385,7 @@ index 1db5f517e7bfb..981b4321f6aa9 100644
using views::View;
using web_modal::WebContentsModalDialogHost;
using web_modal::ModalDialogHostObserver;
@@ -463,6 +467,11 @@ int BrowserViewLayout::LayoutWebUITabStrip(int top) {
@@ -466,6 +470,11 @@ int BrowserViewLayout::LayoutWebUITabStrip(int top) {
int BrowserViewLayout::LayoutToolbar(int top) {
TRACE_EVENT0("ui", "BrowserViewLayout::LayoutToolbar");
@@ -414,10 +414,10 @@ index bc047256f110a..b6bc9dfc0eee5 100644
ContentsWebView::~ContentsWebView() {
diff --git chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
index 5a7767fc35042..681171bc557ba 100644
index 4ce6220af8f31..5ffe7ee08f2bb 100644
--- chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
+++ chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
@@ -552,33 +552,47 @@ gfx::Range BrowserTabStripController::ListTabsInGroup(
@@ -558,33 +558,47 @@ gfx::Range BrowserTabStripController::ListTabsInGroup(
}
bool BrowserTabStripController::IsFrameCondensed() const {
@@ -466,7 +466,7 @@ index 5a7767fc35042..681171bc557ba 100644
}
diff --git chrome/browser/ui/views/toolbar/toolbar_view.cc chrome/browser/ui/views/toolbar/toolbar_view.cc
index 55fc13d5d929d..236eaebed8d1b 100644
index ef34f041219b5..79e83f9214a36 100644
--- chrome/browser/ui/views/toolbar/toolbar_view.cc
+++ chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -169,12 +169,13 @@ auto& GetViewCommandMap() {