diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 171c3005a..739bcd5c0 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -7,6 +7,6 @@ # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding { - 'chromium_checkout': 'refs/tags/115.0.5790.40', + 'chromium_checkout': 'refs/tags/115.0.5790.99', 'depot_tools_checkout': 'df2f11113c' } diff --git a/patch/patches/chrome_browser_browser.patch b/patch/patches/chrome_browser_browser.patch index 58d9ef47c..ba0612e65 100644 --- a/patch/patches/chrome_browser_browser.patch +++ b/patch/patches/chrome_browser_browser.patch @@ -13,7 +13,7 @@ index 2480282a19d12..dbd1fbf8a15b5 100644 return false; } diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn -index 742bcf66760a6..43aef26f3768a 100644 +index 7a0b2dd74a3be..370dc999ebe4f 100644 --- chrome/browser/ui/BUILD.gn +++ chrome/browser/ui/BUILD.gn @@ -9,6 +9,7 @@ import("//build/config/compiler/compiler.gni") @@ -61,7 +61,7 @@ index 742bcf66760a6..43aef26f3768a 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", -@@ -6084,6 +6090,7 @@ static_library("ui") { +@@ -6086,6 +6092,7 @@ static_library("ui") { if (enable_printing) { deps += [ "//components/printing/browser", diff --git a/patch/patches/chrome_browser_context_menus.patch b/patch/patches/chrome_browser_context_menus.patch index 1e8ff03d1..d982ecc71 100644 --- a/patch/patches/chrome_browser_context_menus.patch +++ b/patch/patches/chrome_browser_context_menus.patch @@ -1,8 +1,8 @@ diff --git chrome/browser/renderer_context_menu/render_view_context_menu.cc chrome/browser/renderer_context_menu/render_view_context_menu.cc -index 7e25c4f0656fa..446075c9dfaf7 100644 +index 216e16410ba43..fabdee75267a3 100644 --- chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -322,6 +322,13 @@ base::OnceCallback* GetMenuShownCallback() { +@@ -324,6 +324,13 @@ base::OnceCallback* GetMenuShownCallback() { return callback.get(); } @@ -16,7 +16,7 @@ index 7e25c4f0656fa..446075c9dfaf7 100644 enum class UmaEnumIdLookupType { GeneralEnumId, ContextSpecificEnumId, -@@ -568,6 +575,10 @@ int FindUMAEnumValueForCommand(int id, UmaEnumIdLookupType type) { +@@ -570,6 +577,10 @@ int FindUMAEnumValueForCommand(int id, UmaEnumIdLookupType type) { if (ContextMenuMatcher::IsExtensionsCustomCommandId(id)) return 1; @@ -27,7 +27,7 @@ index 7e25c4f0656fa..446075c9dfaf7 100644 id = CollapseCommandsForUMA(id); const auto& map = GetIdcToUmaMap(type); auto it = map.find(id); -@@ -808,6 +819,14 @@ RenderViewContextMenu::RenderViewContextMenu( +@@ -810,6 +821,14 @@ RenderViewContextMenu::RenderViewContextMenu( #if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) pdf_ocr_submenu_model_ = std::make_unique(this); #endif // BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) @@ -42,10 +42,10 @@ index 7e25c4f0656fa..446075c9dfaf7 100644 } RenderViewContextMenu::~RenderViewContextMenu() = default; -@@ -1229,6 +1248,12 @@ void RenderViewContextMenu::InitMenu() { - // menu, meaning that each menu item added/removed in this function will cause - // it to visibly jump on the screen (see b/173569669). - AppendQuickAnswersItems(); +@@ -1244,6 +1263,12 @@ void RenderViewContextMenu::InitMenu() { + autofill::PopupHidingReason::kContextMenuOpened); + } + } + + if (first_observer_) { + // Do this last so that the observer can optionally modify previously @@ -55,7 +55,7 @@ index 7e25c4f0656fa..446075c9dfaf7 100644 } Profile* RenderViewContextMenu::GetProfile() const { -@@ -3224,6 +3249,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting( +@@ -3239,6 +3264,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting( execute_plugin_action_callback_ = std::move(cb); } diff --git a/patch/patches/chrome_browser_profiles.patch b/patch/patches/chrome_browser_profiles.patch index 193073187..1419d8439 100644 --- a/patch/patches/chrome_browser_profiles.patch +++ b/patch/patches/chrome_browser_profiles.patch @@ -99,7 +99,7 @@ index a3ee1846fcf77..13edaf1203d69 100644 return raw_otr_profile; } diff --git chrome/browser/profiles/profile_manager.cc chrome/browser/profiles/profile_manager.cc -index 92dec1c25477c..0723bdb6bc6ad 100644 +index 9eb766c7a5818..3a66b90b55dd6 100644 --- chrome/browser/profiles/profile_manager.cc +++ chrome/browser/profiles/profile_manager.cc @@ -389,7 +389,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir) @@ -112,7 +112,7 @@ index 92dec1c25477c..0723bdb6bc6ad 100644 zombie_metrics_timer_.Start(FROM_HERE, base::Minutes(30), this, diff --git chrome/browser/profiles/profile_manager.h chrome/browser/profiles/profile_manager.h -index 60c9fd19fe15b..2a3e317d9c240 100644 +index 9bb7cd968c95d..bf16634f7dfe8 100644 --- chrome/browser/profiles/profile_manager.h +++ chrome/browser/profiles/profile_manager.h @@ -130,7 +130,7 @@ class ProfileManager : public Profile::Delegate { diff --git a/patch/patches/chrome_runtime_views.patch b/patch/patches/chrome_runtime_views.patch index a381f3c22..487f3dd71 100644 --- a/patch/patches/chrome_runtime_views.patch +++ b/patch/patches/chrome_runtime_views.patch @@ -703,10 +703,10 @@ index 2753a95f8ff35..9745477102917 100644 } diff --git chrome/browser/ui/views/toolbar/toolbar_view.cc chrome/browser/ui/views/toolbar/toolbar_view.cc -index 4682fa0f74996..099742d04102a 100644 +index 641236e5f8d88..03d55e77c1e31 100644 --- chrome/browser/ui/views/toolbar/toolbar_view.cc +++ chrome/browser/ui/views/toolbar/toolbar_view.cc -@@ -175,12 +175,13 @@ constexpr int kBrowserAppMenuRefreshCollapsedMargin = 2; +@@ -176,12 +176,13 @@ constexpr int kBrowserAppMenuRefreshCollapsedMargin = 2; //////////////////////////////////////////////////////////////////////////////// // ToolbarView, public: @@ -722,7 +722,7 @@ index 4682fa0f74996..099742d04102a 100644 SetID(VIEW_ID_TOOLBAR); if (display_mode_ == DisplayMode::NORMAL) { -@@ -202,6 +203,19 @@ ToolbarView::~ToolbarView() { +@@ -203,6 +204,19 @@ ToolbarView::~ToolbarView() { } void ToolbarView::Init() { @@ -742,7 +742,7 @@ index 4682fa0f74996..099742d04102a 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 -@@ -211,12 +225,13 @@ void ToolbarView::Init() { +@@ -212,12 +226,13 @@ void ToolbarView::Init() { #endif auto location_bar = std::make_unique( browser_, browser_->profile(), browser_->command_controller(), this, @@ -758,7 +758,7 @@ index 4682fa0f74996..099742d04102a 100644 download_button = std::make_unique(browser_view_); } -@@ -297,8 +312,10 @@ void ToolbarView::Init() { +@@ -298,8 +313,10 @@ void ToolbarView::Init() { } } std::unique_ptr cast; @@ -770,7 +770,7 @@ index 4682fa0f74996..099742d04102a 100644 std::unique_ptr media_button; if (base::FeatureList::IsEnabled(media::kGlobalMediaControls)) { -@@ -308,7 +325,8 @@ void ToolbarView::Init() { +@@ -309,7 +326,8 @@ void ToolbarView::Init() { std::unique_ptr send_tab_to_self_button; @@ -780,15 +780,15 @@ index 4682fa0f74996..099742d04102a 100644 send_tab_to_self_button = std::make_unique( browser_view_); -@@ -316,7 +334,7 @@ void ToolbarView::Init() { +@@ -317,7 +335,7 @@ void ToolbarView::Init() { std::unique_ptr side_panel_button; std::unique_ptr side_panel_toolbar_container; - if (browser_view_->unified_side_panel()) { + if (browser_view_->unified_side_panel() && BUTTON_VISIBLE(kSidePanel)) { - if (base::FeatureList::IsEnabled( - companion::features::kSidePanelCompanion)) { + if (companion::IsCompanionFeatureEnabled()) { side_panel_toolbar_container = + std::make_unique(browser_view_); diff --git chrome/browser/ui/views/toolbar/toolbar_view.h chrome/browser/ui/views/toolbar/toolbar_view.h index c38f2b0545d21..fe9a92b2f610c 100644 --- chrome/browser/ui/views/toolbar/toolbar_view.h