Update to Chromium version 106.0.5249.0 (#1036826)

This commit is contained in:
Marshall Greenblatt
2022-08-22 21:37:40 -04:00
parent 6d71f5ffd7
commit 7659dd60ba
84 changed files with 694 additions and 473 deletions

View File

@@ -13,10 +13,10 @@ index 3285e422f76c1..5f35b91897b75 100644
return false;
}
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
index 7612f95eed78e..e6da8824627b2 100644
index c74b111116687..e71d33a11ebdc 100644
--- chrome/browser/ui/BUILD.gn
+++ chrome/browser/ui/BUILD.gn
@@ -10,6 +10,7 @@ import("//build/config/compiler/compiler.gni")
@@ -9,6 +9,7 @@ import("//build/config/compiler/compiler.gni")
import("//build/config/features.gni")
import("//build/config/ozone.gni")
import("//build/config/ui.gni")
@@ -24,7 +24,7 @@ index 7612f95eed78e..e6da8824627b2 100644
import("//chrome/browser/buildflags.gni")
import("//chrome/common/features.gni")
import("//chromeos/ash/components/assistant/assistant.gni")
@@ -362,6 +363,10 @@ static_library("ui") {
@@ -361,6 +362,10 @@ static_library("ui") {
"//build/config/compiler:wexit_time_destructors",
]
@@ -35,7 +35,7 @@ index 7612f95eed78e..e6da8824627b2 100644
# Since browser and browser_ui actually depend on each other,
# we must omit the dependency from browser_ui to browser.
# However, this means browser_ui and browser should more or less
@@ -385,6 +390,7 @@ static_library("ui") {
@@ -384,6 +389,7 @@ static_library("ui") {
"//build:chromeos_buildflags",
"//build/config/chromebox_for_meetings:buildflags",
"//cc/paint",
@@ -43,7 +43,7 @@ index 7612f95eed78e..e6da8824627b2 100644
"//chrome:extra_resources",
"//chrome:resources",
"//chrome:strings",
@@ -5528,6 +5534,7 @@ static_library("ui") {
@@ -5590,6 +5596,7 @@ static_library("ui") {
if (enable_basic_printing) {
deps += [
"//components/printing/browser",
@@ -52,10 +52,10 @@ index 7612f95eed78e..e6da8824627b2 100644
]
}
diff --git chrome/browser/ui/browser.cc chrome/browser/ui/browser.cc
index 3aa1e336d8da2..2826a41485deb 100644
index 244584b4df1fb..77612face5286 100644
--- chrome/browser/ui/browser.cc
+++ chrome/browser/ui/browser.cc
@@ -264,6 +264,25 @@
@@ -265,6 +265,25 @@
#include "components/captive_portal/content/captive_portal_tab_helper.h"
#endif
@@ -95,7 +95,7 @@ index 3aa1e336d8da2..2826a41485deb 100644
location_bar_model_ = std::make_unique<LocationBarModelImpl>(
location_bar_model_delegate_.get(), content::kMaxURLDisplayChars);
@@ -1342,6 +1368,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent(
@@ -1339,6 +1365,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent(
if (exclusive_access_manager_->HandleUserKeyEvent(event))
return content::KeyboardEventProcessingResult::HANDLED;
@@ -110,7 +110,7 @@ index 3aa1e336d8da2..2826a41485deb 100644
return window()->PreHandleKeyboardEvent(event);
}
@@ -1349,8 +1383,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source,
@@ -1346,8 +1380,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source,
const NativeWebKeyboardEvent& event) {
DevToolsWindow* devtools_window =
DevToolsWindow::GetInstanceForInspectedWebContents(source);
@@ -131,7 +131,7 @@ index 3aa1e336d8da2..2826a41485deb 100644
}
bool Browser::TabsNeedBeforeUnloadFired() {
@@ -1564,6 +1608,14 @@ WebContents* Browser::OpenURLFromTab(WebContents* source,
@@ -1554,6 +1598,14 @@ WebContents* Browser::OpenURLFromTab(WebContents* source,
return window->OpenURLFromTab(source, params);
}
@@ -146,7 +146,7 @@ index 3aa1e336d8da2..2826a41485deb 100644
NavigateParams nav_params(this, params.url, params.transition);
nav_params.FillNavigateParamsFromOpenURLParams(params);
nav_params.source_contents = source;
@@ -1693,6 +1745,15 @@ void Browser::AddNewContents(WebContents* source,
@@ -1683,6 +1735,15 @@ void Browser::AddNewContents(WebContents* source,
return;
}
@@ -162,7 +162,7 @@ index 3aa1e336d8da2..2826a41485deb 100644
chrome::AddWebContents(this, source, std::move(new_contents), target_url,
disposition, initial_rect, window_action);
}
@@ -1711,6 +1772,8 @@ void Browser::LoadingStateChanged(WebContents* source,
@@ -1701,6 +1762,8 @@ void Browser::LoadingStateChanged(WebContents* source,
bool should_show_loading_ui) {
ScheduleUIUpdate(source, content::INVALIDATE_TYPE_LOAD);
UpdateWindowForLoadingStateChanged(source, should_show_loading_ui);
@@ -171,7 +171,7 @@ index 3aa1e336d8da2..2826a41485deb 100644
}
void Browser::CloseContents(WebContents* source) {
@@ -1738,6 +1801,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) {
@@ -1728,6 +1791,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) {
}
void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
@@ -180,7 +180,7 @@ index 3aa1e336d8da2..2826a41485deb 100644
if (!GetStatusBubble())
return;
@@ -1745,6 +1810,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
@@ -1735,6 +1800,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
GetStatusBubble()->SetURL(url);
}
@@ -198,7 +198,7 @@ index 3aa1e336d8da2..2826a41485deb 100644
void Browser::ContentsMouseEvent(WebContents* source,
bool motion,
bool exited) {
@@ -1769,6 +1845,19 @@ bool Browser::TakeFocus(content::WebContents* source, bool reverse) {
@@ -1759,6 +1835,19 @@ bool Browser::TakeFocus(content::WebContents* source, bool reverse) {
return false;
}
@@ -218,7 +218,7 @@ index 3aa1e336d8da2..2826a41485deb 100644
void Browser::BeforeUnloadFired(WebContents* web_contents,
bool proceed,
bool* proceed_to_fire_unload) {
@@ -1861,6 +1950,10 @@ void Browser::WebContentsCreated(WebContents* source_contents,
@@ -1851,6 +1940,10 @@ void Browser::WebContentsCreated(WebContents* source_contents,
// Make the tab show up in the task manager.
task_manager::WebContentsTags::CreateForTabContents(new_contents);
@@ -229,7 +229,7 @@ index 3aa1e336d8da2..2826a41485deb 100644
}
void Browser::PortalWebContentsCreated(WebContents* portal_web_contents) {
@@ -1905,6 +1998,8 @@ void Browser::RendererResponsive(
@@ -1895,6 +1988,8 @@ void Browser::RendererResponsive(
void Browser::DidNavigatePrimaryMainFramePostCommit(WebContents* web_contents) {
if (web_contents == tab_strip_model_->GetActiveWebContents())
UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE);
@@ -238,7 +238,7 @@ index 3aa1e336d8da2..2826a41485deb 100644
}
content::JavaScriptDialogManager* Browser::GetJavaScriptDialogManager(
@@ -1965,11 +2060,15 @@ void Browser::EnterFullscreenModeForTab(
@@ -1955,11 +2050,15 @@ void Browser::EnterFullscreenModeForTab(
const blink::mojom::FullscreenOptions& options) {
exclusive_access_manager_->fullscreen_controller()->EnterFullscreenModeForTab(
requesting_frame, options.display_id);
@@ -302,7 +302,7 @@ index 3aa1e336d8da2..2826a41485deb 100644
void Browser::TabDetachedAtImpl(content::WebContents* contents,
diff --git chrome/browser/ui/browser.h chrome/browser/ui/browser.h
index c9e2f4c315d27..54cb88c98d72c 100644
index 38ee0d848089a..d242536872d13 100644
--- chrome/browser/ui/browser.h
+++ chrome/browser/ui/browser.h
@@ -22,6 +22,7 @@
@@ -324,7 +324,7 @@ index c9e2f4c315d27..54cb88c98d72c 100644
#if BUILDFLAG(IS_ANDROID)
#error This file should only be included on desktop.
#endif
@@ -320,6 +325,11 @@ class Browser : public TabStripModelObserver,
@@ -317,6 +322,11 @@ class Browser : public TabStripModelObserver,
float initial_aspect_ratio = 1.0f;
bool lock_aspect_ratio = false;
@@ -336,7 +336,7 @@ index c9e2f4c315d27..54cb88c98d72c 100644
private:
friend class Browser;
friend class WindowSizerChromeOSTest;
@@ -395,6 +405,13 @@ class Browser : public TabStripModelObserver,
@@ -392,6 +402,13 @@ class Browser : public TabStripModelObserver,
force_skip_warning_user_on_close_ = force_skip_warning_user_on_close;
}
@@ -350,7 +350,7 @@ index c9e2f4c315d27..54cb88c98d72c 100644
// Accessors ////////////////////////////////////////////////////////////////
const CreateParams& create_params() const { return create_params_; }
@@ -468,6 +485,12 @@ class Browser : public TabStripModelObserver,
@@ -465,6 +482,12 @@ class Browser : public TabStripModelObserver,
base::WeakPtr<Browser> AsWeakPtr();
@@ -363,7 +363,7 @@ index c9e2f4c315d27..54cb88c98d72c 100644
// Get the FindBarController for this browser, creating it if it does not
// yet exist.
FindBarController* GetFindBarController();
@@ -837,11 +860,19 @@ class Browser : public TabStripModelObserver,
@@ -838,11 +861,19 @@ class Browser : public TabStripModelObserver,
void SetContentsBounds(content::WebContents* source,
const gfx::Rect& bounds) override;
void UpdateTargetURL(content::WebContents* source, const GURL& url) override;
@@ -383,7 +383,7 @@ index c9e2f4c315d27..54cb88c98d72c 100644
void BeforeUnloadFired(content::WebContents* source,
bool proceed,
bool* proceed_to_fire_unload) override;
@@ -1241,6 +1272,8 @@ class Browser : public TabStripModelObserver,
@@ -1244,6 +1275,8 @@ class Browser : public TabStripModelObserver,
const std::string initial_workspace_;
bool initial_visible_on_all_workspaces_state_;
@@ -392,7 +392,7 @@ index c9e2f4c315d27..54cb88c98d72c 100644
CreationSource creation_source_ = CreationSource::kUnknown;
UnloadController unload_controller_;
@@ -1312,6 +1345,10 @@ class Browser : public TabStripModelObserver,
@@ -1313,6 +1346,10 @@ class Browser : public TabStripModelObserver,
std::unique_ptr<screen_ai::AXScreenAIAnnotator> screen_ai_annotator_;
#endif
@@ -404,10 +404,10 @@ index c9e2f4c315d27..54cb88c98d72c 100644
// The following factory is used for chrome update coalescing.
diff --git chrome/browser/ui/browser_navigator.cc chrome/browser/ui/browser_navigator.cc
index 36244f0893bc6..3bbc1b68988f3 100644
index ef9eff48c6498..c93c4aae718c2 100644
--- chrome/browser/ui/browser_navigator.cc
+++ chrome/browser/ui/browser_navigator.cc
@@ -563,6 +563,13 @@ std::unique_ptr<content::WebContents> CreateTargetContents(
@@ -559,6 +559,13 @@ std::unique_ptr<content::WebContents> CreateTargetContents(
std::unique_ptr<WebContents> target_contents =
WebContents::Create(create_params);
@@ -422,10 +422,10 @@ index 36244f0893bc6..3bbc1b68988f3 100644
// tab helpers, so the entire set of tab helpers needs to be set up
// immediately.
diff --git chrome/browser/ui/browser_tabstrip.cc chrome/browser/ui/browser_tabstrip.cc
index fc41ea1501856..7e6ef189bbc51 100644
index 0b377aacbfbe8..ccf5403a3978f 100644
--- chrome/browser/ui/browser_tabstrip.cc
+++ chrome/browser/ui/browser_tabstrip.cc
@@ -31,9 +31,13 @@ void AddTabAt(Browser* browser,
@@ -32,9 +32,13 @@ void AddTabAt(Browser* browser,
// Time new tab page creation time. We keep track of the timing data in
// WebContents, but we want to include the time it takes to create the
// WebContents object too.