bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 132.0.6834.0

Browse Source
This commit is contained in:
Marshall Greenblatt
2024-11-14 17:07:03 -05:00
parent c166b4abc9
commit 34dbad30db
91 changed files with 832 additions and 871 deletions
Download Patch File Download Diff File Expand all files Collapse all files

138
patch/patches/chrome_runtime_views.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/ui/browser_command_controller.cc chrome/browser/ui/browser_command_controller.cc
index 14e7065d7dbd6..b01501b4253a3 100644
index ec7c90dc23958..0fa7a7110cf43 100644
--- chrome/browser/ui/browser_command_controller.cc
+++ chrome/browser/ui/browser_command_controller.cc
@@ -414,6 +414,7 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
@ -24,7 +24,7 @@ index 14e7065d7dbd6..b01501b4253a3 100644
// The order of commands in this switch statement must match the function
// declaration order in browser.h!
switch (id) {
@@ -1207,11 +1215,13 @@ void BrowserCommandController::TabRestoreServiceLoaded(
@@ -1203,11 +1211,13 @@ void BrowserCommandController::TabRestoreServiceLoaded(
// BrowserCommandController, private:
bool BrowserCommandController::IsShowingMainUI() {
@ -41,10 +41,10 @@ index 14e7065d7dbd6..b01501b4253a3 100644
void BrowserCommandController::InitCommandState() {
diff --git chrome/browser/ui/toolbar/app_menu_model.cc chrome/browser/ui/toolbar/app_menu_model.cc
index 32f5ef6e5ac36..6b82915434afe 100644
index 5d09d33c4a730..205a4fbb6abe3 100644
--- chrome/browser/ui/toolbar/app_menu_model.cc
+++ chrome/browser/ui/toolbar/app_menu_model.cc
@@ -717,10 +717,12 @@ FindAndEditSubMenuModel::FindAndEditSubMenuModel(
@@ -714,10 +714,12 @@ FindAndEditSubMenuModel::FindAndEditSubMenuModel(
ui::SimpleMenuModel::Delegate* delegate)
: SimpleMenuModel(delegate) {
AddItemWithStringIdAndVectorIcon(this, IDC_FIND, IDS_FIND, kSearchMenuIcon);
@ -57,7 +57,7 @@ index 32f5ef6e5ac36..6b82915434afe 100644
}
class SaveAndShareSubMenuModel : public ui::SimpleMenuModel {
@@ -785,6 +787,57 @@ SaveAndShareSubMenuModel::SaveAndShareSubMenuModel(
@@ -782,6 +784,57 @@ SaveAndShareSubMenuModel::SaveAndShareSubMenuModel(
}
}
@ -115,7 +115,7 @@ index 32f5ef6e5ac36..6b82915434afe 100644
} // namespace
////////////////////////////////////////////////////////////////////////////////
@@ -1701,7 +1754,7 @@ bool AppMenuModel::IsCommandIdChecked(int command_id) const {
@@ -1696,7 +1749,7 @@ bool AppMenuModel::IsCommandIdChecked(int command_id) const {
return false;
}
@ -124,7 +124,7 @@ index 32f5ef6e5ac36..6b82915434afe 100644
GlobalError* error =
GlobalErrorServiceFactory::GetForProfile(browser_->profile())
->GetGlobalErrorByMenuItemCommandID(command_id);
@@ -1717,6 +1770,30 @@ bool AppMenuModel::IsCommandIdEnabled(int command_id) const {
@@ -1712,6 +1765,30 @@ bool AppMenuModel::IsCommandIdEnabled(int command_id) const {
}
}
@ -155,7 +155,7 @@ index 32f5ef6e5ac36..6b82915434afe 100644
bool AppMenuModel::IsCommandIdAlerted(int command_id) const {
if (command_id == IDC_VIEW_PASSWORDS ||
command_id == IDC_SHOW_PASSWORD_MANAGER) {
@@ -1873,8 +1950,10 @@ void AppMenuModel::Build() {
@@ -1868,8 +1945,10 @@ void AppMenuModel::Build() {
IDS_CLEAR_BROWSING_DATA,
kTrashCanRefreshIcon);
@ -166,7 +166,7 @@ index 32f5ef6e5ac36..6b82915434afe 100644
AddSeparator(ui::NORMAL_SEPARATOR);
AddItemWithStringIdAndVectorIcon(this, IDC_PRINT, IDS_PRINT, kPrintMenuIcon);
@@ -1977,6 +2056,11 @@ void AppMenuModel::Build() {
@@ -1965,6 +2044,11 @@ void AppMenuModel::Build() {
}
#endif // !BUILDFLAG(IS_CHROMEOS_ASH)
@ -179,10 +179,10 @@ index 32f5ef6e5ac36..6b82915434afe 100644
}
diff --git chrome/browser/ui/toolbar/app_menu_model.h chrome/browser/ui/toolbar/app_menu_model.h
index 426ca35c4c814..247cfd2d99731 100644
index 84787f30b7b01..df979d0f711a0 100644
--- chrome/browser/ui/toolbar/app_menu_model.h
+++ chrome/browser/ui/toolbar/app_menu_model.h
@@ -232,6 +232,7 @@ class AppMenuModel : public ui::SimpleMenuModel,
@@ -231,6 +231,7 @@ class AppMenuModel : public ui::SimpleMenuModel,
void ExecuteCommand(int command_id, int event_flags) override;
bool IsCommandIdChecked(int command_id) const override;
bool IsCommandIdEnabled(int command_id) const override;
@ -190,7 +190,7 @@ index 426ca35c4c814..247cfd2d99731 100644
bool IsCommandIdAlerted(int command_id) const override;
bool IsElementIdAlerted(ui::ElementIdentifier element_id) const override;
bool GetAcceleratorForCommandId(int command_id,
@@ -272,6 +273,8 @@ class AppMenuModel : public ui::SimpleMenuModel,
@@ -271,6 +272,8 @@ class AppMenuModel : public ui::SimpleMenuModel,
void LogSafetyHubInteractionMetrics(safety_hub::SafetyHubModuleType sh_module,
int event_flags);
@ -219,10 +219,10 @@ index 81455e1765477..7357122b31b1d 100644
return gfx::Rect();
}
diff --git chrome/browser/ui/views/frame/browser_frame.cc chrome/browser/ui/views/frame/browser_frame.cc
index 711d389229e08..780e1b9201c72 100644
index cc1dbe6666468..c41b6e9cc4803 100644
--- chrome/browser/ui/views/frame/browser_frame.cc
+++ chrome/browser/ui/views/frame/browser_frame.cc
@@ -115,15 +115,25 @@ ui::ColorProviderKey::SchemeVariant GetSchemeVariant(
@@ -112,15 +112,25 @@ ui::ColorProviderKey::SchemeVariant GetSchemeVariant(
////////////////////////////////////////////////////////////////////////////////
// BrowserFrame, public:
@ -250,7 +250,7 @@ index 711d389229e08..780e1b9201c72 100644
}
BrowserFrame::~BrowserFrame() {}
@@ -229,10 +239,20 @@ void BrowserFrame::LayoutWebAppWindowTitle(
@@ -226,10 +236,20 @@ void BrowserFrame::LayoutWebAppWindowTitle(
}
int BrowserFrame::GetTopInset() const {
@ -271,7 +271,7 @@ index 711d389229e08..780e1b9201c72 100644
browser_frame_view_->UpdateThrobber(running);
}
@@ -241,6 +261,8 @@ BrowserNonClientFrameView* BrowserFrame::GetFrameView() const {
@@ -238,6 +258,8 @@ BrowserNonClientFrameView* BrowserFrame::GetFrameView() const {
}
bool BrowserFrame::UseCustomFrame() const {
@ -280,7 +280,7 @@ index 711d389229e08..780e1b9201c72 100644
return native_browser_frame_->UseCustomFrame();
}
@@ -255,20 +277,30 @@ bool BrowserFrame::ShouldDrawFrameHeader() const {
@@ -252,20 +274,30 @@ bool BrowserFrame::ShouldDrawFrameHeader() const {
void BrowserFrame::GetWindowPlacement(
gfx::Rect* bounds,
ui::mojom::WindowShowState* show_state) const {
@ -311,7 +311,7 @@ index 711d389229e08..780e1b9201c72 100644
browser_frame_view_->OnBrowserViewInitViewsComplete();
}
@@ -369,6 +401,8 @@ ui::ColorProviderKey::ThemeInitializerSupplier* BrowserFrame::GetCustomTheme()
@@ -366,6 +398,8 @@ ui::ColorProviderKey::ThemeInitializerSupplier* BrowserFrame::GetCustomTheme()
}
void BrowserFrame::OnNativeWidgetWorkspaceChanged() {
@ -320,7 +320,7 @@ index 711d389229e08..780e1b9201c72 100644
chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace());
chrome::SaveWindowVisibleOnAllWorkspaces(browser_view_->browser(),
IsVisibleOnAllWorkspaces());
@@ -575,6 +609,13 @@ void BrowserFrame::SelectNativeTheme() {
@@ -572,6 +606,13 @@ void BrowserFrame::SelectNativeTheme() {
return;
}
@ -334,7 +334,7 @@ index 711d389229e08..780e1b9201c72 100644
// Ignore the system theme for web apps with window-controls-overlay as the
// display_override so the web contents can blend with the overlay by using
// the developer-provided theme color for a better experience. Context:
@@ -640,5 +681,8 @@ bool BrowserFrame::RegenerateFrameOnThemeChange(
@@ -637,5 +678,8 @@ bool BrowserFrame::RegenerateFrameOnThemeChange(
}
bool BrowserFrame::IsIncognitoBrowser() const {
@ -344,7 +344,7 @@ index 711d389229e08..780e1b9201c72 100644
return browser_view_->browser()->profile()->IsIncognitoProfile();
}
diff --git chrome/browser/ui/views/frame/browser_frame.h chrome/browser/ui/views/frame/browser_frame.h
index 532705a04c47b..0272f27596df6 100644
index 3d8a15049d4d2..66c4789581fe1 100644
--- chrome/browser/ui/views/frame/browser_frame.h
+++ chrome/browser/ui/views/frame/browser_frame.h
@@ -59,6 +59,7 @@ enum class TabDragKind {
@ -364,7 +364,7 @@ index 532705a04c47b..0272f27596df6 100644
// views::Widget:
views::internal::RootView* CreateRootView() override;
@@ -171,22 +172,26 @@ class BrowserFrame : public views::Widget, public views::ContextMenuController {
@@ -172,22 +173,26 @@ class BrowserFrame : public views::Widget, public views::ContextMenuController {
void SetTabDragKind(TabDragKind tab_drag_kind);
TabDragKind tab_drag_kind() const { return tab_drag_kind_; }
@ -397,10 +397,10 @@ index 532705a04c47b..0272f27596df6 100644
// regenerated.
bool RegenerateFrameOnThemeChange(BrowserThemeChangeType theme_change_type);
diff --git chrome/browser/ui/views/frame/browser_view.cc chrome/browser/ui/views/frame/browser_view.cc
index 8c08f4c3f10fa..721a7b1d5f136 100644
index 3944e4463304d..9f09d246c0b6a 100644
--- chrome/browser/ui/views/frame/browser_view.cc
+++ chrome/browser/ui/views/frame/browser_view.cc
@@ -366,10 +366,6 @@ constexpr base::FeatureParam<base::TimeDelta> kLoadingTabAnimationFrameDelay = {
@@ -361,10 +361,6 @@ constexpr base::FeatureParam<base::TimeDelta> kLoadingTabAnimationFrameDelay = {
&kChangeFrameRateOfLoadingTabAnimation, "loading_tab_animation_frame_delay",
base::Milliseconds(30)};
@ -408,10 +408,10 @@ index 8c08f4c3f10fa..721a7b1d5f136 100644
-// locate this object using just the handle.
-const char* const kBrowserViewKey = "__BROWSER_VIEW__";
-
#if BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_CHROMEOS)
// UMA histograms that record animation smoothness for tab loading animation.
constexpr char kTabLoadingSmoothnessHistogramName[] =
@@ -769,6 +765,14 @@ class BrowserViewLayoutDelegateImpl : public BrowserViewLayoutDelegate {
@@ -764,6 +760,14 @@ class BrowserViewLayoutDelegateImpl : public BrowserViewLayoutDelegate {
return browser_view_->frame()->GetTopInset() - browser_view_->y();
}
@ -426,7 +426,7 @@ index 8c08f4c3f10fa..721a7b1d5f136 100644
bool IsToolbarVisible() const override {
return browser_view_->IsToolbarVisible();
}
@@ -920,11 +924,21 @@ class BrowserView::AccessibilityModeObserver : public ui::AXModeObserver {
@@ -915,11 +919,21 @@ class BrowserView::AccessibilityModeObserver : public ui::AXModeObserver {
///////////////////////////////////////////////////////////////////////////////
// BrowserView, public:
@ -449,7 +449,7 @@ index 8c08f4c3f10fa..721a7b1d5f136 100644
SetShowIcon(
::ShouldShowWindowIcon(browser_.get(), AppUsesWindowControlsOverlay()));
@@ -1014,8 +1028,15 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
@@ -1009,8 +1023,15 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
contents_container->SetLayoutManager(std::make_unique<ContentsLayoutManager>(
devtools_web_view_, contents_web_view_, watermark_view_));
@ -467,7 +467,7 @@ index 8c08f4c3f10fa..721a7b1d5f136 100644
contents_separator_ =
top_container_->AddChildView(std::make_unique<ContentsSeparator>());
@@ -1095,7 +1116,9 @@ void BrowserView::ToggleCompactModeUI() {
@@ -1094,7 +1115,9 @@ void BrowserView::ToggleCompactModeUI() {
}
BrowserView::~BrowserView() {
@ -477,7 +477,7 @@ index 8c08f4c3f10fa..721a7b1d5f136 100644
// Destroy the top controls slide controller first as it depends on the
// tabstrip model and the browser frame.
@@ -1103,7 +1126,9 @@ BrowserView::~BrowserView() {
@@ -1102,7 +1125,9 @@ BrowserView::~BrowserView() {
// All the tabs should have been destroyed already. If we were closed by the
// OS with some tabs than the NativeBrowserFrame should have destroyed them.
@ -487,7 +487,7 @@ index 8c08f4c3f10fa..721a7b1d5f136 100644
// Stop the animation timer explicitly here to avoid running it in a nested
// message loop, which may run by Browser destructor.
@@ -1112,17 +1137,18 @@ BrowserView::~BrowserView() {
@@ -1111,17 +1136,18 @@ BrowserView::~BrowserView() {
// Immersive mode may need to reparent views before they are removed/deleted.
immersive_mode_controller_.reset();
@ -510,7 +510,7 @@ index 8c08f4c3f10fa..721a7b1d5f136 100644
// These are raw pointers to child views, so they need to be set to null
// before `RemoveAllChildViews()` is called to avoid dangling.
@@ -1703,6 +1729,16 @@ gfx::Point BrowserView::GetThemeOffsetFromBrowserView() const {
@@ -1702,6 +1728,16 @@ gfx::Point BrowserView::GetThemeOffsetFromBrowserView() const {
ThemeProperties::kFrameHeightAboveTabs - browser_view_origin.y());
}
@ -527,7 +527,7 @@ index 8c08f4c3f10fa..721a7b1d5f136 100644
// static:
BrowserView::DevToolsDockedPlacement BrowserView::GetDevToolsDockedPlacement(
const gfx::Rect& contents_webview_bounds,
@@ -2118,9 +2154,14 @@ void BrowserView::OnExclusiveAccessUserInput() {
@@ -2113,9 +2149,14 @@ void BrowserView::OnExclusiveAccessUserInput() {
bool BrowserView::ShouldHideUIForFullscreen() const {
// Immersive mode needs UI for the slide-down top panel.
@ -543,7 +543,7 @@ index 8c08f4c3f10fa..721a7b1d5f136 100644
return frame_->GetFrameView()->ShouldHideTopUIForFullscreen();
}
@@ -3308,7 +3349,8 @@ views::View* BrowserView::GetTopContainer() {
@@ -3297,7 +3338,8 @@ views::View* BrowserView::GetTopContainer() {
}
DownloadBubbleUIController* BrowserView::GetDownloadBubbleUIController() {
@ -553,7 +553,7 @@ index 8c08f4c3f10fa..721a7b1d5f136 100644
if (auto* download_button = toolbar_button_provider_->GetDownloadButton())
return download_button->bubble_controller();
return nullptr;
@@ -3890,7 +3932,8 @@ void BrowserView::ReparentTopContainerForEndOfImmersive() {
@@ -3865,7 +3907,8 @@ void BrowserView::ReparentTopContainerForEndOfImmersive() {
if (top_container()->parent() == this)
return;
@ -563,7 +563,7 @@ index 8c08f4c3f10fa..721a7b1d5f136 100644
top_container()->DestroyLayer();
AddChildViewAt(top_container(), 0);
EnsureFocusOrder();
@@ -4381,11 +4424,38 @@ void BrowserView::GetAccessiblePanes(std::vector<views::View*>* panes) {
@@ -4356,11 +4399,38 @@ void BrowserView::GetAccessiblePanes(std::vector<views::View*>* panes) {
bool BrowserView::ShouldDescendIntoChildForEventHandling(
gfx::NativeView child,
const gfx::Point& location) {
@ -604,7 +604,7 @@ index 8c08f4c3f10fa..721a7b1d5f136 100644
// Draggable regions are defined relative to the web contents.
gfx::Point point_in_contents_web_view_coords(location);
views::View::ConvertPointToTarget(GetWidget()->GetRootView(),
@@ -4394,7 +4464,7 @@ bool BrowserView::ShouldDescendIntoChildForEventHandling(
@@ -4369,7 +4439,7 @@ bool BrowserView::ShouldDescendIntoChildForEventHandling(
// Draggable regions should be ignored for clicks into any browser view's
// owned widgets, for example alerts, permission prompts or find bar.
@ -613,7 +613,7 @@ index 8c08f4c3f10fa..721a7b1d5f136 100644
point_in_contents_web_view_coords.x(),
point_in_contents_web_view_coords.y()) ||
WidgetOwnedByAnchorContainsPoint(point_in_contents_web_view_coords);
@@ -4505,8 +4575,10 @@ void BrowserView::Layout(PassKey) {
@@ -4480,8 +4550,10 @@ void BrowserView::Layout(PassKey) {
// TODO(jamescook): Why was this in the middle of layout code?
toolbar_->location_bar()->omnibox_view()->SetFocusBehavior(
@ -626,7 +626,7 @@ index 8c08f4c3f10fa..721a7b1d5f136 100644
// Some of the situations when the BrowserView is laid out are:
// - Enter/exit immersive fullscreen mode.
@@ -4572,6 +4644,11 @@ void BrowserView::AddedToWidget() {
@@ -4547,6 +4619,11 @@ void BrowserView::AddedToWidget() {
SetThemeProfileForWindow(GetNativeWindow(), browser_->profile());
#endif
@ -638,7 +638,7 @@ index 8c08f4c3f10fa..721a7b1d5f136 100644
toolbar_->Init();
// TODO(pbos): Investigate whether the side panels should be creatable when
@@ -4614,13 +4691,9 @@ void BrowserView::AddedToWidget() {
@@ -4589,13 +4666,9 @@ void BrowserView::AddedToWidget() {
EnsureFocusOrder();
@ -654,7 +654,7 @@ index 8c08f4c3f10fa..721a7b1d5f136 100644
using_native_frame_ = frame_->ShouldUseNativeFrame();
MaybeInitializeWebUITabStrip();
@@ -5006,7 +5079,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen, const int64_t display_id) {
@@ -4964,7 +5037,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen, const int64_t display_id) {
// Undo our anti-jankiness hacks and force a re-layout.
in_process_fullscreen_ = false;
ToolbarSizeChanged(false);
@ -664,7 +664,7 @@ index 8c08f4c3f10fa..721a7b1d5f136 100644
}
void BrowserView::RequestFullscreen(bool fullscreen, int64_t display_id) {
@@ -5512,6 +5586,8 @@ Profile* BrowserView::GetProfile() {
@@ -5448,6 +5522,8 @@ Profile* BrowserView::GetProfile() {
}
void BrowserView::UpdateUIForTabFullscreen() {
@ -673,7 +673,7 @@ index 8c08f4c3f10fa..721a7b1d5f136 100644
frame()->GetFrameView()->UpdateFullscreenTopUI();
}
@@ -5534,6 +5610,8 @@ void BrowserView::HideDownloadShelf() {
@@ -5470,6 +5546,8 @@ void BrowserView::HideDownloadShelf() {
}
bool BrowserView::CanUserExitFullscreen() const {
@ -683,10 +683,10 @@ index 8c08f4c3f10fa..721a7b1d5f136 100644
}
diff --git chrome/browser/ui/views/frame/browser_view.h chrome/browser/ui/views/frame/browser_view.h
index bdb273f5134b8..2750336aca016 100644
index 8addda3741841..5be1d534b9bd8 100644
--- chrome/browser/ui/views/frame/browser_view.h
+++ chrome/browser/ui/views/frame/browser_view.h
@@ -139,11 +139,16 @@ class BrowserView : public BrowserWindow,
@@ -137,11 +137,16 @@ class BrowserView : public BrowserWindow,
METADATA_HEADER(BrowserView, views::ClientView)
public:
@ -703,7 +703,7 @@ index bdb273f5134b8..2750336aca016 100644
void set_frame(BrowserFrame* frame) {
frame_ = frame;
paint_as_active_subscription_ =
@@ -841,6 +846,10 @@ class BrowserView : public BrowserWindow,
@@ -839,6 +844,10 @@ class BrowserView : public BrowserWindow,
void Copy();
void Paste();
@ -714,7 +714,7 @@ index bdb273f5134b8..2750336aca016 100644
protected:
// Enumerates where the devtools are docked relative to the browser's main
// web contents.
@@ -864,6 +873,8 @@ class BrowserView : public BrowserWindow,
@@ -862,6 +871,8 @@ class BrowserView : public BrowserWindow,
const gfx::Rect& contents_webview_bounds,
const gfx::Rect& local_webview_container_bounds);
@ -724,7 +724,7 @@ index bdb273f5134b8..2750336aca016 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 148c255ec04d3..edce177e093ac 100644
index 38064da1c8818..98ecdff6ce089 100644
--- chrome/browser/ui/views/frame/browser_view_layout.cc
+++ chrome/browser/ui/views/frame/browser_view_layout.cc
@@ -53,6 +53,10 @@
@ -842,12 +842,12 @@ index 71445bfab1824..c77750ea2a820 100644
ContentsWebView::~ContentsWebView() {
diff --git chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc
index 3489ec2810cdf..db6881a0e2923 100644
index 961b599ffc364..92faacd1be534 100644
--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc
+++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc
@@ -618,6 +618,11 @@ PictureInPictureBrowserFrameView::PictureInPictureBrowserFrameView(
return window->GetProperty(chromeos::kWindowStateTypeKey);
})));
@@ -602,6 +602,11 @@ PictureInPictureBrowserFrameView::PictureInPictureBrowserFrameView(
frame_background_ = std::make_unique<views::FrameBackground>();
}
#endif
+
+ if (!browser_view->browser()->SupportsWindowFeature(
@ -857,7 +857,7 @@ index 3489ec2810cdf..db6881a0e2923 100644
}
PictureInPictureBrowserFrameView::~PictureInPictureBrowserFrameView() {
@@ -745,18 +750,42 @@ gfx::Rect PictureInPictureBrowserFrameView::GetWindowBoundsForClientBounds(
@@ -729,18 +734,42 @@ gfx::Rect PictureInPictureBrowserFrameView::GetWindowBoundsForClientBounds(
int PictureInPictureBrowserFrameView::NonClientHitTest(
const gfx::Point& point) {
@ -908,7 +908,7 @@ index 3489ec2810cdf..db6881a0e2923 100644
// Allow dragging and resizing the window.
int window_component = GetHTComponentForFrame(
@@ -825,7 +854,8 @@ void PictureInPictureBrowserFrameView::Layout(PassKey) {
@@ -809,7 +838,8 @@ void PictureInPictureBrowserFrameView::Layout(PassKey) {
gfx::Rect content_area = GetLocalBounds();
content_area.Inset(FrameBorderInsets());
gfx::Rect top_bar = content_area;
@ -918,7 +918,7 @@ index 3489ec2810cdf..db6881a0e2923 100644
top_bar_container_view_->SetBoundsRect(top_bar);
#if !BUILDFLAG(IS_ANDROID)
if (auto_pip_setting_overlay_) {
@@ -1371,7 +1401,8 @@ gfx::Insets PictureInPictureBrowserFrameView::ResizeBorderInsets() const {
@@ -1349,7 +1379,8 @@ gfx::Insets PictureInPictureBrowserFrameView::ResizeBorderInsets() const {
}
int PictureInPictureBrowserFrameView::GetTopAreaHeight() const {
@ -943,10 +943,10 @@ index 33c6444869375..d74818698d81a 100644
LocationBarView* location_bar_view = browser_view_->GetLocationBarView();
CHECK(location_bar_view);
diff --git chrome/browser/ui/views/page_action/page_action_icon_controller.cc chrome/browser/ui/views/page_action/page_action_icon_controller.cc
index 40993f5460555..3bf4fb49b71f3 100644
index ba726946aa3cd..e62fe9c21290a 100644
--- chrome/browser/ui/views/page_action/page_action_icon_controller.cc
+++ chrome/browser/ui/views/page_action/page_action_icon_controller.cc
@@ -98,6 +98,12 @@ void PageActionIconController::Init(const PageActionIconParams& params,
@@ -97,6 +97,12 @@ void PageActionIconController::Init(const PageActionIconParams& params,
};
for (PageActionIconType type : params.types_enabled) {
@ -960,10 +960,10 @@ index 40993f5460555..3bf4fb49b71f3 100644
case PageActionIconType::kPaymentsOfferNotification:
add_page_action_icon(
diff --git chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
index a80a496c99a26..7cb24bf8505de 100644
index 3cfed2fdd5acf..720b418456292 100644
--- chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
+++ chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
@@ -604,29 +604,41 @@ gfx::Range BrowserTabStripController::ListTabsInGroup(
@@ -605,29 +605,41 @@ gfx::Range BrowserTabStripController::ListTabsInGroup(
}
bool BrowserTabStripController::IsFrameCondensed() const {
@ -1006,10 +1006,10 @@ index a80a496c99a26..7cb24bf8505de 100644
}
diff --git chrome/browser/ui/views/toolbar/toolbar_view.cc chrome/browser/ui/views/toolbar/toolbar_view.cc
index 1b494d20b6342..c3eb67da3c3ba 100644
index b85883d5057b2..71835868d795b 100644
--- chrome/browser/ui/views/toolbar/toolbar_view.cc
+++ chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -193,7 +193,7 @@ class TabstripLikeBackground : public views::Background {
@@ -186,7 +186,7 @@ class TabstripLikeBackground : public views::Background {
void Paint(gfx::Canvas* canvas, views::View* view) const override {
bool painted = TopContainerBackground::PaintThemeCustomImage(canvas, view,
browser_view_);
@ -1018,7 +1018,7 @@ index 1b494d20b6342..c3eb67da3c3ba 100644
SkColor frame_color =
browser_view_->frame()->GetFrameView()->GetFrameColor(
BrowserFrameActiveState::kUseCurrent);
@@ -224,12 +224,13 @@ END_METADATA
@@ -217,12 +217,13 @@ END_METADATA
////////////////////////////////////////////////////////////////////////////////
// ToolbarView, public:
@ -1034,7 +1034,7 @@ index 1b494d20b6342..c3eb67da3c3ba 100644
SetID(VIEW_ID_TOOLBAR);
container_view_ = AddChildView(std::make_unique<ContainerView>());
@@ -258,9 +259,24 @@ ToolbarView::~ToolbarView() {
@@ -251,9 +252,24 @@ ToolbarView::~ToolbarView() {
for (const auto& view_and_command : GetViewCommandMap())
chrome::RemoveCommandObserver(browser_, view_and_command.second, this);
@ -1059,7 +1059,7 @@ index 1b494d20b6342..c3eb67da3c3ba 100644
#if defined(USE_AURA)
// Avoid generating too many occlusion tracking calculation events before this
// function returns. The occlusion status will be computed only once once this
@@ -283,12 +299,12 @@ void ToolbarView::Init() {
@@ -276,12 +292,12 @@ void ToolbarView::Init() {
auto location_bar = std::make_unique<LocationBarView>(
browser_, browser_->profile(), browser_->command_controller(), this,
@ -1074,7 +1074,7 @@ index 1b494d20b6342..c3eb67da3c3ba 100644
download_button =
std::make_unique<DownloadToolbarButtonView>(browser_view_);
}
@@ -370,7 +386,8 @@ void ToolbarView::Init() {
@@ -363,7 +379,8 @@ void ToolbarView::Init() {
std::unique_ptr<media_router::CastToolbarButton> cast;
if (!(features::IsToolbarPinningEnabled() &&
base::FeatureList::IsEnabled(features::kPinnedCastButton))) {
@ -1084,7 +1084,7 @@ index 1b494d20b6342..c3eb67da3c3ba 100644
cast = media_router::CastToolbarButton::Create(browser_);
}
}
@@ -383,7 +400,8 @@ void ToolbarView::Init() {
@@ -376,7 +393,8 @@ void ToolbarView::Init() {
std::unique_ptr<send_tab_to_self::SendTabToSelfToolbarIconView>
send_tab_to_self_button;
@ -1094,7 +1094,7 @@ index 1b494d20b6342..c3eb67da3c3ba 100644
send_tab_to_self_button =
std::make_unique<send_tab_to_self::SendTabToSelfToolbarIconView>(
browser_view_);
@@ -845,7 +863,8 @@ void ToolbarView::Layout(PassKey) {
@@ -836,7 +854,8 @@ void ToolbarView::Layout(PassKey) {
if (display_mode_ == DisplayMode::NORMAL) {
LayoutCommon();
@ -1105,10 +1105,10 @@ index 1b494d20b6342..c3eb67da3c3ba 100644
if (toolbar_controller_) {
diff --git chrome/browser/ui/views/toolbar/toolbar_view.h chrome/browser/ui/views/toolbar/toolbar_view.h
index b02224437ad20..81f639f5faf9f 100644
index 01dfd343c678a..2cfa5dd830fba 100644
--- chrome/browser/ui/views/toolbar/toolbar_view.h
+++ chrome/browser/ui/views/toolbar/toolbar_view.h
@@ -94,7 +94,8 @@ class ToolbarView : public views::AccessiblePaneView,
@@ -93,7 +93,8 @@ class ToolbarView : public views::AccessiblePaneView,
// needs to be displayed.
};