Update to Chromium version 120.0.6099.35

This commit is contained in:
Marshall Greenblatt
2023-11-27 15:56:19 -05:00
parent d6af79e7a6
commit 7edfbed283
12 changed files with 90 additions and 89 deletions

View File

@ -75,7 +75,7 @@ index 169b2041595fe..a5d3ec34d36bd 100644
}
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
index 83bb8314906d5..0970f80bf9ae8 100644
index c860d165db483..c567e63476d02 100644
--- chrome/browser/ui/BUILD.gn
+++ chrome/browser/ui/BUILD.gn
@@ -9,6 +9,7 @@ import("//build/config/compiler/compiler.gni")
@ -105,7 +105,7 @@ index 83bb8314906d5..0970f80bf9ae8 100644
"//chrome:resources",
"//chrome:strings",
"//chrome/app:chrome_dll_resources",
@@ -2810,6 +2816,8 @@ static_library("ui") {
@@ -2812,6 +2818,8 @@ static_library("ui") {
"views/apps/app_dialog/app_block_dialog_view.h",
"views/apps/app_dialog/app_pause_dialog_view.cc",
"views/apps/app_dialog/app_pause_dialog_view.h",
@ -114,7 +114,7 @@ index 83bb8314906d5..0970f80bf9ae8 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",
@@ -4768,8 +4776,6 @@ static_library("ui") {
@@ -4770,8 +4778,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",
@ -123,7 +123,7 @@ index 83bb8314906d5..0970f80bf9ae8 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",
@@ -6494,6 +6500,7 @@ static_library("ui") {
@@ -6496,6 +6502,7 @@ static_library("ui") {
if (enable_printing) {
deps += [
"//components/printing/browser",
@ -132,7 +132,7 @@ index 83bb8314906d5..0970f80bf9ae8 100644
]
}
diff --git chrome/browser/ui/browser.cc chrome/browser/ui/browser.cc
index bd2f3d64f3f38..7f70339454e16 100644
index ea0fb984ecb5a..316b4dd9a701e 100644
--- chrome/browser/ui/browser.cc
+++ chrome/browser/ui/browser.cc
@@ -264,6 +264,25 @@
@ -301,7 +301,7 @@ index bd2f3d64f3f38..7f70339454e16 100644
void Browser::BeforeUnloadFired(WebContents* web_contents,
bool proceed,
bool* proceed_to_fire_unload) {
@@ -1924,6 +2009,10 @@ void Browser::WebContentsCreated(WebContents* source_contents,
@@ -1931,6 +2016,10 @@ void Browser::WebContentsCreated(WebContents* source_contents,
// Make the tab show up in the task manager.
task_manager::WebContentsTags::CreateForTabContents(new_contents);
@ -312,7 +312,7 @@ index bd2f3d64f3f38..7f70339454e16 100644
}
void Browser::PortalWebContentsCreated(WebContents* portal_web_contents) {
@@ -2080,11 +2169,15 @@ void Browser::EnterFullscreenModeForTab(
@@ -2087,11 +2176,15 @@ void Browser::EnterFullscreenModeForTab(
const blink::mojom::FullscreenOptions& options) {
exclusive_access_manager_->fullscreen_controller()->EnterFullscreenModeForTab(
requesting_frame, options.display_id);
@ -328,7 +328,7 @@ index bd2f3d64f3f38..7f70339454e16 100644
}
bool Browser::IsFullscreenForTabOrPending(const WebContents* web_contents) {
@@ -2277,6 +2370,15 @@ void Browser::RequestMediaAccessPermission(
@@ -2284,6 +2377,15 @@ void Browser::RequestMediaAccessPermission(
content::WebContents* web_contents,
const content::MediaStreamRequest& request,
content::MediaResponseCallback callback) {
@ -344,7 +344,7 @@ index bd2f3d64f3f38..7f70339454e16 100644
const extensions::Extension* extension =
GetExtensionForOrigin(profile_, request.security_origin);
MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest(
@@ -2828,9 +2930,11 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) {
@@ -2835,9 +2937,11 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) {
// Browser, Getters for UI (private):
StatusBubble* Browser::GetStatusBubble() {
@ -357,7 +357,7 @@ index bd2f3d64f3f38..7f70339454e16 100644
}
// We hide the status bar for web apps windows as this matches native
@@ -2838,6 +2942,12 @@ StatusBubble* Browser::GetStatusBubble() {
@@ -2845,6 +2949,12 @@ StatusBubble* Browser::GetStatusBubble() {
// mode, as the minimal browser UI includes the status bar.
if (web_app::AppBrowserController::IsWebApp(this) &&
!app_controller()->HasMinimalUiButtons()) {
@ -370,7 +370,7 @@ index bd2f3d64f3f38..7f70339454e16 100644
return nullptr;
}
@@ -2974,6 +3084,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
@@ -2981,6 +3091,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
BookmarkTabHelper::FromWebContents(web_contents)->RemoveObserver(this);
web_contents_collection_.StopObserving(web_contents);
}
@ -379,7 +379,7 @@ index bd2f3d64f3f38..7f70339454e16 100644
}
void Browser::TabDetachedAtImpl(content::WebContents* contents,
@@ -3128,6 +3240,14 @@ bool Browser::PictureInPictureBrowserSupportsWindowFeature(
@@ -3135,6 +3247,14 @@ bool Browser::PictureInPictureBrowserSupportsWindowFeature(
bool Browser::SupportsWindowFeatureImpl(WindowFeature feature,
bool check_can_support) const {
@ -395,7 +395,7 @@ index bd2f3d64f3f38..7f70339454e16 100644
case TYPE_NORMAL:
return NormalBrowserSupportsWindowFeature(feature, check_can_support);
diff --git chrome/browser/ui/browser.h chrome/browser/ui/browser.h
index 6544740362683..976a0e375a1f1 100644
index f6efb82abb4ff..f0efbf7abb041 100644
--- chrome/browser/ui/browser.h
+++ chrome/browser/ui/browser.h
@@ -22,6 +22,7 @@
@ -480,7 +480,7 @@ index 6544740362683..976a0e375a1f1 100644
void BeforeUnloadFired(content::WebContents* source,
bool proceed,
bool* proceed_to_fire_unload) override;
@@ -1227,6 +1262,10 @@ class Browser : public TabStripModelObserver,
@@ -1228,6 +1263,10 @@ class Browser : public TabStripModelObserver,
// This Browser's window.
raw_ptr<BrowserWindow, DanglingUntriaged> window_;
@ -491,7 +491,7 @@ index 6544740362683..976a0e375a1f1 100644
std::unique_ptr<TabStripModelDelegate> const tab_strip_model_delegate_;
std::unique_ptr<TabStripModel> const tab_strip_model_;
@@ -1296,6 +1335,8 @@ class Browser : public TabStripModelObserver,
@@ -1297,6 +1336,8 @@ class Browser : public TabStripModelObserver,
const std::string initial_workspace_;
bool initial_visible_on_all_workspaces_state_;