Update to Chromium version 127.0.6533.41

This commit is contained in:
Marshall Greenblatt
2024-07-10 12:50:51 -04:00
parent 7f27173f2f
commit 96ac3d04b4
18 changed files with 127 additions and 149 deletions

View File

@ -74,7 +74,7 @@ index 02ff1e580d3a7..7f51115896049 100644
}
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
index 74460ac479210..8cf70c80a87ad 100644
index 49e6bdcbd55a6..0425eb49c4296 100644
--- chrome/browser/ui/BUILD.gn
+++ chrome/browser/ui/BUILD.gn
@@ -8,6 +8,7 @@ import("//build/config/compiler/compiler.gni")
@ -104,7 +104,7 @@ index 74460ac479210..8cf70c80a87ad 100644
"//chrome:resources",
"//chrome:strings",
"//chrome/app:chrome_dll_resources",
@@ -3040,6 +3046,8 @@ static_library("ui") {
@@ -3045,6 +3051,8 @@ static_library("ui") {
"views/apps/app_dialog/app_local_block_dialog_view.h",
"views/apps/app_dialog/app_pause_dialog_view.cc",
"views/apps/app_dialog/app_pause_dialog_view.h",
@ -113,7 +113,7 @@ index 74460ac479210..8cf70c80a87ad 100644
"views/apps/app_info_dialog/arc_app_info_links_panel.cc",
"views/apps/app_info_dialog/arc_app_info_links_panel.h",
"views/apps/chrome_app_window_client_views_chromeos.cc",
@@ -4249,8 +4257,6 @@ static_library("ui") {
@@ -4254,8 +4262,6 @@ static_library("ui") {
"autofill/payments/webauthn_dialog_model.h",
"autofill/payments/webauthn_dialog_model_observer.h",
"autofill/payments/webauthn_dialog_state.h",
@ -122,7 +122,7 @@ index 74460ac479210..8cf70c80a87ad 100644
"incognito_clear_browsing_data_dialog_interface.h",
"signin/signin_modal_dialog.cc",
"signin/signin_modal_dialog.h",
@@ -5125,8 +5131,6 @@ static_library("ui") {
@@ -5130,8 +5136,6 @@ static_library("ui") {
"views/accessibility/theme_tracking_non_accessible_image_view.h",
"views/apps/app_dialog/app_dialog_view.cc",
"views/apps/app_dialog/app_dialog_view.h",
@ -131,7 +131,7 @@ index 74460ac479210..8cf70c80a87ad 100644
"views/apps/app_info_dialog/app_info_dialog_container.cc",
"views/apps/app_info_dialog/app_info_dialog_container.h",
"views/apps/app_info_dialog/app_info_dialog_views.cc",
@@ -6908,6 +6912,7 @@ static_library("ui") {
@@ -6913,6 +6917,7 @@ static_library("ui") {
if (enable_printing) {
deps += [
"//components/printing/browser",
@ -140,7 +140,7 @@ index 74460ac479210..8cf70c80a87ad 100644
]
}
diff --git chrome/browser/ui/browser.cc chrome/browser/ui/browser.cc
index 4683794bedaa9..de933a524299d 100644
index b4eadfdbfcfac..8ee3f0f988f6d 100644
--- chrome/browser/ui/browser.cc
+++ chrome/browser/ui/browser.cc
@@ -272,6 +272,25 @@
@ -180,7 +180,7 @@ index 4683794bedaa9..de933a524299d 100644
tab_strip_model_delegate_(
std::make_unique<chrome::BrowserTabStripModelDelegate>(this)),
tab_strip_model_(std::make_unique<TabStripModel>(
@@ -761,6 +784,12 @@ Browser::~Browser() {
@@ -759,6 +782,12 @@ Browser::~Browser() {
// away so they don't try and call back to us.
if (select_file_dialog_.get())
select_file_dialog_->ListenerDestroyed();
@ -193,7 +193,7 @@ index 4683794bedaa9..de933a524299d 100644
}
///////////////////////////////////////////////////////////////////////////////
@@ -1221,6 +1250,8 @@ void Browser::WindowFullscreenStateChanged() {
@@ -1219,6 +1248,8 @@ void Browser::WindowFullscreenStateChanged() {
->WindowFullscreenStateChanged();
command_controller_->FullscreenStateChanged();
UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TOGGLE_FULLSCREEN);
@ -202,7 +202,7 @@ index 4683794bedaa9..de933a524299d 100644
}
void Browser::FullscreenTopUIStateChanged() {
@@ -1594,6 +1625,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent(
@@ -1592,6 +1623,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent(
if (exclusive_access_manager_->HandleUserKeyEvent(event))
return content::KeyboardEventProcessingResult::HANDLED;
@ -217,7 +217,7 @@ index 4683794bedaa9..de933a524299d 100644
return window()->PreHandleKeyboardEvent(event);
}
@@ -1601,8 +1640,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source,
@@ -1599,8 +1638,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source,
const NativeWebKeyboardEvent& event) {
DevToolsWindow* devtools_window =
DevToolsWindow::GetInstanceForInspectedWebContents(source);
@ -238,7 +238,7 @@ index 4683794bedaa9..de933a524299d 100644
}
bool Browser::TabsNeedBeforeUnloadFired() const {
@@ -1778,6 +1827,16 @@ WebContents* Browser::OpenURLFromTab(
@@ -1776,6 +1825,16 @@ WebContents* Browser::OpenURLFromTab(
}
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -255,7 +255,7 @@ index 4683794bedaa9..de933a524299d 100644
NavigateParams nav_params(this, params.url, params.transition);
nav_params.FillNavigateParamsFromOpenURLParams(params);
nav_params.source_contents = source;
@@ -1940,6 +1999,8 @@ void Browser::LoadingStateChanged(WebContents* source,
@@ -1938,6 +1997,8 @@ void Browser::LoadingStateChanged(WebContents* source,
bool should_show_loading_ui) {
ScheduleUIUpdate(source, content::INVALIDATE_TYPE_LOAD);
UpdateWindowForLoadingStateChanged(source, should_show_loading_ui);
@ -264,7 +264,7 @@ index 4683794bedaa9..de933a524299d 100644
}
void Browser::CloseContents(WebContents* source) {
@@ -1968,6 +2029,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) {
@@ -1966,6 +2027,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) {
}
void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
@ -273,7 +273,7 @@ index 4683794bedaa9..de933a524299d 100644
if (!GetStatusBubble())
return;
@@ -1975,6 +2038,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
@@ -1973,6 +2036,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
GetStatusBubble()->SetURL(url);
}
@ -291,7 +291,7 @@ index 4683794bedaa9..de933a524299d 100644
void Browser::ContentsMouseEvent(WebContents* source, const ui::Event& event) {
const ui::EventType type = event.type();
const bool exited = type == ui::ET_MOUSE_EXITED;
@@ -2002,6 +2076,19 @@ bool Browser::TakeFocus(content::WebContents* source, bool reverse) {
@@ -2000,6 +2074,19 @@ bool Browser::TakeFocus(content::WebContents* source, bool reverse) {
return false;
}
@ -311,7 +311,7 @@ index 4683794bedaa9..de933a524299d 100644
void Browser::BeforeUnloadFired(WebContents* web_contents,
bool proceed,
bool* proceed_to_fire_unload) {
@@ -2101,12 +2188,24 @@ void Browser::WebContentsCreated(WebContents* source_contents,
@@ -2099,12 +2186,24 @@ void Browser::WebContentsCreated(WebContents* source_contents,
// Make the tab show up in the task manager.
task_manager::WebContentsTags::CreateForTabContents(new_contents);
@ -336,7 +336,7 @@ index 4683794bedaa9..de933a524299d 100644
// Don't show the page hung dialog when a HTML popup hangs because
// the dialog will take the focus and immediately close the popup.
RenderWidgetHostView* view = render_widget_host->GetView();
@@ -2119,6 +2218,13 @@ void Browser::RendererUnresponsive(
@@ -2117,6 +2216,13 @@ void Browser::RendererUnresponsive(
void Browser::RendererResponsive(
WebContents* source,
content::RenderWidgetHost* render_widget_host) {
@ -350,7 +350,7 @@ index 4683794bedaa9..de933a524299d 100644
RenderWidgetHostView* view = render_widget_host->GetView();
if (view && !render_widget_host->GetView()->IsHTMLFormPopup()) {
TabDialogs::FromWebContents(source)->HideHungRendererDialog(
@@ -2128,6 +2234,15 @@ void Browser::RendererResponsive(
@@ -2126,6 +2232,15 @@ void Browser::RendererResponsive(
content::JavaScriptDialogManager* Browser::GetJavaScriptDialogManager(
WebContents* source) {
@ -366,7 +366,7 @@ index 4683794bedaa9..de933a524299d 100644
return javascript_dialogs::TabModalDialogManager::FromWebContents(source);
}
@@ -2163,6 +2278,11 @@ void Browser::DraggableRegionsChanged(
@@ -2161,6 +2276,11 @@ void Browser::DraggableRegionsChanged(
if (app_controller_) {
app_controller_->DraggableRegionsChanged(regions, contents);
}
@ -378,7 +378,7 @@ index 4683794bedaa9..de933a524299d 100644
}
void Browser::DidFinishNavigation(
@@ -2243,11 +2363,15 @@ void Browser::EnterFullscreenModeForTab(
@@ -2241,11 +2361,15 @@ void Browser::EnterFullscreenModeForTab(
const blink::mojom::FullscreenOptions& options) {
exclusive_access_manager_->fullscreen_controller()->EnterFullscreenModeForTab(
requesting_frame, options.display_id);
@ -394,7 +394,7 @@ index 4683794bedaa9..de933a524299d 100644
}
bool Browser::IsFullscreenForTabOrPending(const WebContents* web_contents) {
@@ -2447,6 +2571,15 @@ void Browser::RequestMediaAccessPermission(
@@ -2445,6 +2569,15 @@ void Browser::RequestMediaAccessPermission(
content::WebContents* web_contents,
const content::MediaStreamRequest& request,
content::MediaResponseCallback callback) {
@ -410,7 +410,7 @@ index 4683794bedaa9..de933a524299d 100644
const extensions::Extension* extension =
GetExtensionForOrigin(profile_, request.security_origin);
MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest(
@@ -2991,9 +3124,11 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) {
@@ -2989,9 +3122,11 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) {
// Browser, Getters for UI (private):
StatusBubble* Browser::GetStatusBubble() {
@ -423,7 +423,7 @@ index 4683794bedaa9..de933a524299d 100644
}
// We hide the status bar for web apps windows as this matches native
@@ -3001,6 +3136,12 @@ StatusBubble* Browser::GetStatusBubble() {
@@ -2999,6 +3134,12 @@ StatusBubble* Browser::GetStatusBubble() {
// mode, as the minimal browser UI includes the status bar.
if (web_app::AppBrowserController::IsWebApp(this) &&
!app_controller()->HasMinimalUiButtons()) {
@ -436,7 +436,7 @@ index 4683794bedaa9..de933a524299d 100644
return nullptr;
}
@@ -3150,6 +3291,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
@@ -3148,6 +3289,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
BookmarkTabHelper::FromWebContents(web_contents)->RemoveObserver(this);
web_contents_collection_.StopObserving(web_contents);
}
@ -445,7 +445,7 @@ index 4683794bedaa9..de933a524299d 100644
}
void Browser::TabDetachedAtImpl(content::WebContents* contents,
@@ -3304,6 +3447,14 @@ bool Browser::PictureInPictureBrowserSupportsWindowFeature(
@@ -3302,6 +3445,14 @@ bool Browser::PictureInPictureBrowserSupportsWindowFeature(
bool Browser::SupportsWindowFeatureImpl(WindowFeature feature,
bool check_can_support) const {
@ -461,10 +461,10 @@ index 4683794bedaa9..de933a524299d 100644
case TYPE_NORMAL:
return NormalBrowserSupportsWindowFeature(feature, check_can_support);
diff --git chrome/browser/ui/browser.h chrome/browser/ui/browser.h
index 69f2c9c0ff003..3cae24a0e42d2 100644
index b6d47818d7648..9265c6ffdee64 100644
--- chrome/browser/ui/browser.h
+++ chrome/browser/ui/browser.h
@@ -22,6 +22,7 @@
@@ -24,6 +24,7 @@
#include "base/timer/elapsed_timer.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
@ -472,7 +472,7 @@ index 69f2c9c0ff003..3cae24a0e42d2 100644
#include "chrome/browser/tab_contents/web_contents_collection.h"
#include "chrome/browser/themes/theme_service_observer.h"
#include "chrome/browser/ui/bookmarks/bookmark_bar.h"
@@ -51,6 +52,10 @@
@@ -53,6 +54,10 @@
#include "ui/gfx/geometry/rect.h"
#include "ui/shell_dialogs/select_file_dialog.h"
@ -483,7 +483,7 @@ index 69f2c9c0ff003..3cae24a0e42d2 100644
#if BUILDFLAG(IS_ANDROID)
#error This file should only be included on desktop.
#endif
@@ -370,6 +375,15 @@ class Browser : public TabStripModelObserver,
@@ -373,6 +378,15 @@ class Browser : public TabStripModelObserver,
// Document Picture in Picture options, specific to TYPE_PICTURE_IN_PICTURE.
std::optional<blink::mojom::PictureInPictureWindowOptions> pip_options;
@ -499,7 +499,7 @@ index 69f2c9c0ff003..3cae24a0e42d2 100644
private:
friend class Browser;
friend class WindowSizerChromeOSTest;
@@ -451,6 +465,13 @@ class Browser : public TabStripModelObserver,
@@ -454,6 +468,13 @@ class Browser : public TabStripModelObserver,
update_ui_immediately_for_testing_ = true;
}
@ -513,7 +513,7 @@ index 69f2c9c0ff003..3cae24a0e42d2 100644
// Accessors ////////////////////////////////////////////////////////////////
const CreateParams& create_params() const { return create_params_; }
@@ -546,6 +567,12 @@ class Browser : public TabStripModelObserver,
@@ -549,6 +570,12 @@ class Browser : public TabStripModelObserver,
base::WeakPtr<Browser> AsWeakPtr();
base::WeakPtr<const Browser> AsWeakPtr() const;
@ -526,7 +526,7 @@ index 69f2c9c0ff003..3cae24a0e42d2 100644
// Get the FindBarController for this browser, creating it if it does not
// yet exist.
FindBarController* GetFindBarController();
@@ -959,10 +986,18 @@ class Browser : public TabStripModelObserver,
@@ -962,10 +989,18 @@ class Browser : public TabStripModelObserver,
void SetContentsBounds(content::WebContents* source,
const gfx::Rect& bounds) override;
void UpdateTargetURL(content::WebContents* source, const GURL& url) override;
@ -545,7 +545,7 @@ index 69f2c9c0ff003..3cae24a0e42d2 100644
void BeforeUnloadFired(content::WebContents* source,
bool proceed,
bool* proceed_to_fire_unload) override;
@@ -1297,6 +1332,10 @@ class Browser : public TabStripModelObserver,
@@ -1300,6 +1335,10 @@ class Browser : public TabStripModelObserver,
// This Browser's window.
raw_ptr<BrowserWindow, DanglingUntriaged> window_;
@ -556,7 +556,7 @@ index 69f2c9c0ff003..3cae24a0e42d2 100644
std::unique_ptr<TabStripModelDelegate> const tab_strip_model_delegate_;
std::unique_ptr<TabStripModel> const tab_strip_model_;
@@ -1363,6 +1402,8 @@ class Browser : public TabStripModelObserver,
@@ -1366,6 +1405,8 @@ class Browser : public TabStripModelObserver,
const std::string initial_workspace_;
bool initial_visible_on_all_workspaces_state_;
@ -566,7 +566,7 @@ index 69f2c9c0ff003..3cae24a0e42d2 100644
UnloadController unload_controller_;
diff --git chrome/browser/ui/browser_navigator.cc chrome/browser/ui/browser_navigator.cc
index ec2ca0cefeb4a..66b480f50f72d 100644
index de008a12ca355..abfe1d6dda667 100644
--- chrome/browser/ui/browser_navigator.cc
+++ chrome/browser/ui/browser_navigator.cc
@@ -313,6 +313,10 @@ std::pair<Browser*, int> GetBrowserAndTabForDisposition(