Update to Chromium version 131.0.6778.70

This commit is contained in:
Marshall Greenblatt
2024-11-14 11:22:11 -05:00
parent e0817536a5
commit 790ec1e1c2
21 changed files with 110 additions and 105 deletions

View File

@ -13,7 +13,7 @@ index 2480282a19d12..dbd1fbf8a15b5 100644
return false;
}
diff --git chrome/browser/devtools/devtools_window.cc chrome/browser/devtools/devtools_window.cc
index 63b6bc3a35b40..91a9a3d42a7c1 100644
index 787a485764b9c..2da2fd82787a0 100644
--- chrome/browser/devtools/devtools_window.cc
+++ chrome/browser/devtools/devtools_window.cc
@@ -38,6 +38,7 @@
@ -88,7 +88,7 @@ index 63b6bc3a35b40..91a9a3d42a7c1 100644
}
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
index 04bfa8a3f5229..535230f4997cf 100644
index 4c9e41d73cedd..eed762cd05bf9 100644
--- chrome/browser/ui/BUILD.gn
+++ chrome/browser/ui/BUILD.gn
@@ -8,6 +8,7 @@ import("//build/config/compiler/compiler.gni")
@ -129,7 +129,7 @@ index 04bfa8a3f5229..535230f4997cf 100644
# TODO(crbug.com/41437292): Remove this circular dependency.
# Any circular includes must depend on the target "//chrome/browser:browser_public_dependencies".
# These are all-platform circular includes.
@@ -5510,6 +5520,7 @@ static_library("ui") {
@@ -5512,6 +5522,7 @@ static_library("ui") {
if (enable_printing) {
deps += [
"//components/printing/browser",
@ -138,10 +138,10 @@ index 04bfa8a3f5229..535230f4997cf 100644
]
}
diff --git chrome/browser/ui/browser.cc chrome/browser/ui/browser.cc
index e87612be40627..41f088fd227b7 100644
index df205a82b34c4..042df3763233b 100644
--- chrome/browser/ui/browser.cc
+++ chrome/browser/ui/browser.cc
@@ -273,6 +273,25 @@
@@ -272,6 +272,25 @@
#include "components/captive_portal/content/captive_portal_tab_helper.h"
#endif
@ -167,7 +167,7 @@ index e87612be40627..41f088fd227b7 100644
#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "chrome/browser/extensions/extension_browser_window_helper.h"
#endif
@@ -537,6 +556,10 @@ Browser::Browser(const CreateParams& params)
@@ -535,6 +554,10 @@ Browser::Browser(const CreateParams& params)
type_(params.type),
profile_(params.profile),
window_(nullptr),
@ -178,7 +178,7 @@ index e87612be40627..41f088fd227b7 100644
tab_strip_model_delegate_(
std::make_unique<chrome::BrowserTabStripModelDelegate>(this)),
tab_strip_model_(std::make_unique<TabStripModel>(
@@ -767,6 +790,12 @@ Browser::~Browser() {
@@ -765,6 +788,12 @@ Browser::~Browser() {
// away so they don't try and call back to us.
if (select_file_dialog_.get())
select_file_dialog_->ListenerDestroyed();
@ -191,7 +191,7 @@ index e87612be40627..41f088fd227b7 100644
}
///////////////////////////////////////////////////////////////////////////////
@@ -1329,6 +1358,8 @@ void Browser::WindowFullscreenStateChanged() {
@@ -1327,6 +1356,8 @@ void Browser::WindowFullscreenStateChanged() {
->WindowFullscreenStateChanged();
command_controller_->FullscreenStateChanged();
UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TOGGLE_FULLSCREEN);
@ -200,7 +200,7 @@ index e87612be40627..41f088fd227b7 100644
}
void Browser::FullscreenTopUIStateChanged() {
@@ -1659,6 +1690,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent(
@@ -1646,6 +1677,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent(
if (exclusive_access_manager_->HandleUserKeyEvent(event))
return content::KeyboardEventProcessingResult::HANDLED;
@ -215,7 +215,7 @@ index e87612be40627..41f088fd227b7 100644
return window()->PreHandleKeyboardEvent(event);
}
@@ -1666,8 +1705,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source,
@@ -1653,8 +1692,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source,
const NativeWebKeyboardEvent& event) {
DevToolsWindow* devtools_window =
DevToolsWindow::GetInstanceForInspectedWebContents(source);
@ -236,7 +236,7 @@ index e87612be40627..41f088fd227b7 100644
}
bool Browser::TabsNeedBeforeUnloadFired() const {
@@ -1822,6 +1871,14 @@ WebContents* Browser::OpenURLFromTab(
@@ -1809,6 +1858,14 @@ WebContents* Browser::OpenURLFromTab(
std::move(navigation_handle_callback));
}
@ -251,7 +251,7 @@ index e87612be40627..41f088fd227b7 100644
NavigateParams nav_params(this, params.url, params.transition);
nav_params.FillNavigateParamsFromOpenURLParams(params);
nav_params.source_contents = source;
@@ -1988,6 +2045,8 @@ void Browser::LoadingStateChanged(WebContents* source,
@@ -1975,6 +2032,8 @@ void Browser::LoadingStateChanged(WebContents* source,
bool should_show_loading_ui) {
ScheduleUIUpdate(source, content::INVALIDATE_TYPE_LOAD);
UpdateWindowForLoadingStateChanged(source, should_show_loading_ui);
@ -260,7 +260,7 @@ index e87612be40627..41f088fd227b7 100644
}
void Browser::CloseContents(WebContents* source) {
@@ -2016,6 +2075,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) {
@@ -2003,6 +2062,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) {
}
void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
@ -269,7 +269,7 @@ index e87612be40627..41f088fd227b7 100644
if (!GetStatusBubble())
return;
@@ -2023,6 +2084,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
@@ -2010,6 +2071,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
GetStatusBubble()->SetURL(url);
}
@ -287,7 +287,7 @@ index e87612be40627..41f088fd227b7 100644
void Browser::ContentsMouseEvent(WebContents* source, const ui::Event& event) {
const ui::EventType type = event.type();
const bool exited = type == ui::EventType::kMouseExited;
@@ -2051,6 +2123,19 @@ bool Browser::TakeFocus(content::WebContents* source, bool reverse) {
@@ -2038,6 +2110,19 @@ bool Browser::TakeFocus(content::WebContents* source, bool reverse) {
return false;
}
@ -307,7 +307,7 @@ index e87612be40627..41f088fd227b7 100644
void Browser::BeforeUnloadFired(WebContents* web_contents,
bool proceed,
bool* proceed_to_fire_unload) {
@@ -2150,12 +2235,24 @@ void Browser::WebContentsCreated(WebContents* source_contents,
@@ -2137,12 +2222,24 @@ void Browser::WebContentsCreated(WebContents* source_contents,
// Make the tab show up in the task manager.
task_manager::WebContentsTags::CreateForTabContents(new_contents);
@ -332,7 +332,7 @@ index e87612be40627..41f088fd227b7 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();
@@ -2168,6 +2265,13 @@ void Browser::RendererUnresponsive(
@@ -2155,6 +2252,13 @@ void Browser::RendererUnresponsive(
void Browser::RendererResponsive(
WebContents* source,
content::RenderWidgetHost* render_widget_host) {
@ -346,7 +346,7 @@ index e87612be40627..41f088fd227b7 100644
RenderWidgetHostView* view = render_widget_host->GetView();
if (view && !render_widget_host->GetView()->IsHTMLFormPopup()) {
TabDialogs::FromWebContents(source)->HideHungRendererDialog(
@@ -2177,6 +2281,15 @@ void Browser::RendererResponsive(
@@ -2164,6 +2268,15 @@ void Browser::RendererResponsive(
content::JavaScriptDialogManager* Browser::GetJavaScriptDialogManager(
WebContents* source) {
@ -362,7 +362,7 @@ index e87612be40627..41f088fd227b7 100644
return javascript_dialogs::TabModalDialogManager::FromWebContents(source);
}
@@ -2212,6 +2325,11 @@ void Browser::DraggableRegionsChanged(
@@ -2199,6 +2312,11 @@ void Browser::DraggableRegionsChanged(
if (app_controller_) {
app_controller_->DraggableRegionsChanged(regions, contents);
}
@ -374,7 +374,7 @@ index e87612be40627..41f088fd227b7 100644
}
void Browser::DidFinishNavigation(
@@ -2292,11 +2410,15 @@ void Browser::EnterFullscreenModeForTab(
@@ -2279,11 +2397,15 @@ void Browser::EnterFullscreenModeForTab(
const blink::mojom::FullscreenOptions& options) {
exclusive_access_manager_->fullscreen_controller()->EnterFullscreenModeForTab(
requesting_frame, options.display_id);
@ -390,7 +390,7 @@ index e87612be40627..41f088fd227b7 100644
}
bool Browser::IsFullscreenForTabOrPending(const WebContents* web_contents) {
@@ -2499,6 +2621,15 @@ void Browser::RequestMediaAccessPermission(
@@ -2486,6 +2608,15 @@ void Browser::RequestMediaAccessPermission(
content::WebContents* web_contents,
const content::MediaStreamRequest& request,
content::MediaResponseCallback callback) {
@ -406,7 +406,7 @@ index e87612be40627..41f088fd227b7 100644
const extensions::Extension* extension =
GetExtensionForOrigin(profile_, request.security_origin);
MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest(
@@ -3059,9 +3190,10 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) {
@@ -3046,9 +3177,10 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) {
// Browser, Getters for UI (private):
StatusBubble* Browser::GetStatusBubble() {
@ -418,7 +418,7 @@ index e87612be40627..41f088fd227b7 100644
}
// We hide the status bar for web apps windows as this matches native
@@ -3069,6 +3201,12 @@ StatusBubble* Browser::GetStatusBubble() {
@@ -3056,6 +3188,12 @@ StatusBubble* Browser::GetStatusBubble() {
// mode, as the minimal browser UI includes the status bar.
if (web_app::AppBrowserController::IsWebApp(this) &&
!app_controller()->HasMinimalUiButtons()) {
@ -431,7 +431,7 @@ index e87612be40627..41f088fd227b7 100644
return nullptr;
}
@@ -3218,6 +3356,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
@@ -3205,6 +3343,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
BookmarkTabHelper::FromWebContents(web_contents)->RemoveObserver(this);
web_contents_collection_.StopObserving(web_contents);
}
@ -440,7 +440,7 @@ index e87612be40627..41f088fd227b7 100644
}
void Browser::TabDetachedAtImpl(content::WebContents* contents,
@@ -3372,6 +3512,14 @@ bool Browser::PictureInPictureBrowserSupportsWindowFeature(
@@ -3359,6 +3499,14 @@ bool Browser::PictureInPictureBrowserSupportsWindowFeature(
bool Browser::SupportsWindowFeatureImpl(WindowFeature feature,
bool check_can_support) const {
@ -456,7 +456,7 @@ index e87612be40627..41f088fd227b7 100644
case TYPE_NORMAL:
return NormalBrowserSupportsWindowFeature(feature, check_can_support);
diff --git chrome/browser/ui/browser.h chrome/browser/ui/browser.h
index 86ea151056ca1..680d143eecb16 100644
index d650375ef1d4d..e3c7758efa53c 100644
--- chrome/browser/ui/browser.h
+++ chrome/browser/ui/browser.h
@@ -24,6 +24,7 @@
@ -521,7 +521,7 @@ index 86ea151056ca1..680d143eecb16 100644
// Get the FindBarController for this browser, creating it if it does not
// yet exist.
FindBarController* GetFindBarController();
@@ -956,10 +983,18 @@ class Browser : public TabStripModelObserver,
@@ -959,10 +986,18 @@ class Browser : public TabStripModelObserver,
void SetContentsBounds(content::WebContents* source,
const gfx::Rect& bounds) override;
void UpdateTargetURL(content::WebContents* source, const GURL& url) override;
@ -540,7 +540,7 @@ index 86ea151056ca1..680d143eecb16 100644
void BeforeUnloadFired(content::WebContents* source,
bool proceed,
bool* proceed_to_fire_unload) override;
@@ -1296,6 +1331,10 @@ class Browser : public TabStripModelObserver,
@@ -1299,6 +1334,10 @@ class Browser : public TabStripModelObserver,
// This Browser's window.
raw_ptr<BrowserWindow, DanglingUntriaged> window_;
@ -551,7 +551,7 @@ index 86ea151056ca1..680d143eecb16 100644
std::unique_ptr<TabStripModelDelegate> const tab_strip_model_delegate_;
std::unique_ptr<TabStripModel> const tab_strip_model_;
@@ -1362,6 +1401,8 @@ class Browser : public TabStripModelObserver,
@@ -1365,6 +1404,8 @@ class Browser : public TabStripModelObserver,
const std::string initial_workspace_;
bool initial_visible_on_all_workspaces_state_;
@ -561,10 +561,10 @@ index 86ea151056ca1..680d143eecb16 100644
UnloadController unload_controller_;
diff --git chrome/browser/ui/browser_navigator.cc chrome/browser/ui/browser_navigator.cc
index 70d7f4fbda71c..103e9c1b2a8f2 100644
index f180b15994c6c..f69d72a70d850 100644
--- chrome/browser/ui/browser_navigator.cc
+++ chrome/browser/ui/browser_navigator.cc
@@ -272,6 +272,10 @@ std::tuple<Browser*, int> GetBrowserAndTabForDisposition(
@@ -271,6 +271,10 @@ std::tuple<Browser*, int> GetBrowserAndTabForDisposition(
browser_params.pip_options = pip_options;
@ -575,7 +575,7 @@ index 70d7f4fbda71c..103e9c1b2a8f2 100644
const BrowserWindow* const browser_window = params.browser->window();
const gfx::NativeWindow native_window =
browser_window ? browser_window->GetNativeWindow()
@@ -560,6 +564,13 @@ std::unique_ptr<content::WebContents> CreateTargetContents(
@@ -559,6 +563,13 @@ std::unique_ptr<content::WebContents> CreateTargetContents(
std::unique_ptr<WebContents> target_contents =
WebContents::Create(create_params);