merge: update to chromium 147.0.7727.55

chromium_version.txt

@@ -1 +1 @@
-146.0.7680.177
+147.0.7727.55

patches/brave/custom-importer.patch

@@ -177,7 +177,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  }  // namespace user_data_importer
 --- a/tools/metrics/histograms/metadata/sql/histograms.xml
 +++ b/tools/metrics/histograms/metadata/sql/histograms.xml
-@@ -50,6 +50,7 @@ chromium-metrics-reviews@google.com.
+@@ -51,6 +51,7 @@ chromium-metrics-reviews@google.com.
    <variant name="DBSCSessions" summary="DBSCSessions"/>
    <variant name="DIPS" summary="DIPS"/>
    <variant name="DownloadRecord" summary="DownloadRecord"/>
@@ -244,7 +244,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    }
 --- a/chrome/common/pref_names.h
 +++ b/chrome/common/pref_names.h
-@@ -4297,6 +4297,9 @@ inline constexpr char kServiceWorkerToCo
+@@ -4015,6 +4015,9 @@ inline constexpr char kServiceWorkerToCo
  inline constexpr char kSharedWorkerBlobURLFixEnabled[] =
      "worker.shared_worker_blob_url_fix_enabled";
 
@@ -256,7 +256,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  inline constexpr char kClearWindowNameForNewBrowsingContextGroup[] =
 --- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
 +++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
-@@ -1168,6 +1168,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
+@@ -1184,6 +1184,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
        settings_api::PrefType::kBoolean;
    (*s_allowlist)[::prefs::kImportDialogSearchEngine] =
        settings_api::PrefType::kBoolean;
@@ -267,23 +267,23 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    // Supervised Users.  This setting is queried in our Tast tests (b/241943380).
 --- a/chrome/browser/ui/webui/settings/settings_ui.cc
 +++ b/chrome/browser/ui/webui/settings/settings_ui.cc
-@@ -58,6 +58,7 @@
+@@ -62,6 +62,7 @@
  #include "chrome/browser/ui/webui/settings/about_handler.h"
  #include "chrome/browser/ui/webui/settings/accessibility_main_handler.h"
  #include "chrome/browser/ui/webui/settings/appearance_handler.h"
 +#include "chrome/browser/ui/webui/settings/brave_import_data_handler.h"
  #include "chrome/browser/ui/webui/settings/browser_lifetime_handler.h"
  #include "chrome/browser/ui/webui/settings/downloads_handler.h"
  #include "chrome/browser/ui/webui/settings/font_handler.h"
-@@ -214,6 +215,7 @@ void SettingsUI::RegisterProfilePrefs(
+@@ -213,6 +214,7 @@ void SettingsUI::RegisterProfilePrefs(
    registry->RegisterBooleanPref(prefs::kImportDialogHistory, true);
    registry->RegisterBooleanPref(prefs::kImportDialogSavedPasswords, true);
    registry->RegisterBooleanPref(prefs::kImportDialogSearchEngine, true);
 +  registry->RegisterBooleanPref(prefs::kImportDialogExtensions, true);
  }
 
  SettingsUI::SettingsUI(content::WebUI* web_ui)
-@@ -243,7 +245,7 @@ SettingsUI::SettingsUI(content::WebUI* w
+@@ -242,7 +244,7 @@ SettingsUI::SettingsUI(content::WebUI* w
    AddSettingsPageUIHandler(std::make_unique<DownloadsHandler>(profile));
    AddSettingsPageUIHandler(std::make_unique<ExtensionControlHandler>());
    AddSettingsPageUIHandler(std::make_unique<FontHandler>(profile));
@@ -294,7 +294,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  #if BUILDFLAG(IS_WIN)
 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -1026,6 +1026,8 @@ void AddImportDataStrings(content::WebUI
+@@ -1044,6 +1044,8 @@ void AddImportDataStrings(content::WebUI
        {"importHistory", IDS_SETTINGS_IMPORT_HISTORY_CHECKBOX},
        {"importFavorites", IDS_SETTINGS_IMPORT_FAVORITES_CHECKBOX},
        {"importPasswords", IDS_SETTINGS_IMPORT_PASSWORDS_CHECKBOX},
@@ -319,7 +319,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
        </div>
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -1249,6 +1249,10 @@ static_library("ui") {
+@@ -1274,6 +1274,10 @@ static_library("ui") {
        "webui/settings/accessibility_main_handler.h",
        "webui/settings/appearance_handler.cc",
        "webui/settings/appearance_handler.h",
@@ -330,7 +330,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
        "webui/settings/browser_lifetime_handler.cc",
        "webui/settings/browser_lifetime_handler.h",
        "webui/settings/captions_handler.cc",
-@@ -1414,6 +1418,13 @@ static_library("ui") {
+@@ -1450,6 +1454,13 @@ static_library("ui") {
        ]
      }
 
@@ -401,9 +401,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    ~ExternalProcessImporterHost() override;
 --- a/components/history/core/browser/history_types.h
 +++ b/components/history/core/browser/history_types.h
-@@ -55,6 +55,8 @@ enum VisitSource {
+@@ -56,6 +56,8 @@ enum VisitSource {
    SOURCE_SAFARI_IMPORTED = 5,
-   SOURCE_ACTOR = 6,
+   SOURCE_ACTOR = 6,  // Added by the GLIC actor.
    SOURCE_OS_MIGRATION_IMPORTED = 7,
 +  SOURCE_CHROME_IMPORTED = 8,
 +  SOURCE_BRAVE_IMPORTED = 9,
@@ -449,16 +449,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
        "importer/importer.cc",
 --- a/chrome/utility/services.cc
 +++ b/chrome/utility/services.cc
-@@ -57,7 +57,9 @@
+@@ -56,7 +56,9 @@
+ #endif  // BUILDFLAG(IS_LINUX)
 
  #if !BUILDFLAG(IS_ANDROID)
- #include "chrome/common/importer/profile_import.mojom.h"
 +#include "chrome/common/importer/chrome_profile_import.mojom.h"
- #include "chrome/utility/importer/profile_import_impl.h"
+ #include "chrome/common/importer/profile_import.mojom.h"
 +#include "chrome/utility/importer/brave_profile_import_impl.h"
- #include "components/legion/oak_session_service/oak_session_service.h"  // nogncheck
+ #include "chrome/utility/importer/profile_import_impl.h"
  #include "components/mirroring/service/mirroring_service.h"
- #include "services/proxy_resolver/proxy_resolver_factory_impl.h"  // nogncheck
+ #include "components/private_ai/oak_session_service/oak_session_service.h"  // nogncheck
 @@ -139,6 +141,13 @@ static_assert(BUILDFLAG(ENABLE_PRINTING)
 
  namespace {
@@ -575,7 +575,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    // entire group has been collected and is ready to be written to the profile.
 --- a/chrome/app/generated_resources.grd
 +++ b/chrome/app/generated_resources.grd
-@@ -11579,6 +11579,15 @@ Check your passwords anytime in <ph name
+@@ -11637,6 +11637,15 @@ Check your passwords anytime in <ph name
              Microsoft Edge
            </message>
          </if>

patches/brave/fix-component-content-settings-store.patch

@@ -33,7 +33,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  #include "extensions/browser/blocklist_extension_prefs.h"
  #include "extensions/browser/delayed_install_manager.h"
  #include "extensions/browser/disable_reason.h"
-@@ -550,6 +551,22 @@ void ExtensionRegistrar::AddComponentExt
+@@ -566,6 +567,22 @@ void ExtensionRegistrar::AddComponentExt
    }
 
    AddExtension(extension);

patches/brave/tab-cycling-mru-impl.patch

@@ -27,15 +27,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 --- a/chrome/browser/ui/tabs/tab_strip_model.cc
 +++ b/chrome/browser/ui/tabs/tab_strip_model.cc
-@@ -74,6 +74,7 @@
+@@ -77,6 +77,7 @@
  #include "chrome/browser/ui/thumbnails/thumbnail_tab_helper.h"
  #include "chrome/browser/ui/ui_features.h"
  #include "chrome/browser/ui/user_education/browser_user_education_interface.h"
 +#include "chrome/browser/ui/views/frame/browser_view.h"
  #include "chrome/browser/ui/views/tabs/dragging/tab_drag_controller.h"
+ #include "chrome/browser/ui/views/tabs/vertical/vertical_tab_strip_metrics.h"
  #include "chrome/browser/ui/web_applications/web_app_dialog_utils.h"
- #include "chrome/browser/ui/web_applications/web_app_launch_utils.h"
-@@ -3987,6 +3988,44 @@ TabStripSelectionChange TabStripModel::S
+@@ -3919,6 +3920,44 @@ TabStripSelectionChange TabStripModel::S
    return selection;
  }
 
@@ -82,7 +82,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
    // This may happen during automated testing or if a user somehow buffers
 --- a/chrome/browser/ui/tabs/tab_strip_model.h
 +++ b/chrome/browser/ui/tabs/tab_strip_model.h
-@@ -615,6 +615,10 @@ class TabStripModel {
+@@ -613,6 +613,10 @@ class TabStripModel {
        TabStripUserGestureDetails detail = TabStripUserGestureDetails(
            TabStripUserGestureDetails::GestureType::kOther));
 
@@ -105,7 +105,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
    // Selects either the next tab (kNext), or the previous tab (kPrevious).
    void SelectRelativeTab(TabRelativeDirection direction,
                           TabStripUserGestureDetails detail);
-@@ -1457,6 +1466,9 @@ class TabStripModel {
+@@ -1470,6 +1479,9 @@ class TabStripModel {
    // The focused group. If no group is focused, this is nullopt.
    std::optional<tab_groups::TabGroupId> focused_group_;
 
@@ -117,7 +117,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 --- a/chrome/browser/ui/views/frame/browser_view.cc
 +++ b/chrome/browser/ui/views/frame/browser_view.cc
-@@ -312,7 +312,10 @@
+@@ -314,7 +314,10 @@
  #include "ui/compositor/paint_recorder.h"
  #include "ui/content_accelerators/accelerator_util.h"
  #include "ui/display/screen.h"
@@ -128,15 +128,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
  #include "ui/gfx/animation/animation_runner.h"
  #include "ui/gfx/canvas.h"
  #include "ui/gfx/color_utils.h"
-@@ -330,6 +333,7 @@
+@@ -332,6 +335,7 @@
  #include "ui/views/controls/button/menu_button.h"
  #include "ui/views/controls/textfield/textfield.h"
  #include "ui/views/controls/webview/webview.h"
 +#include "ui/views/event_monitor.h"
  #include "ui/views/interaction/element_tracker_views.h"
  #include "ui/views/layout/fill_layout.h"
  #include "ui/views/view.h"
-@@ -839,6 +843,83 @@ class BrowserView::ExclusiveAccessContex
+@@ -838,6 +842,83 @@ class BrowserView::ExclusiveAccessContex
    base::WeakPtrFactory<ExclusiveAccessContextImpl> weak_ptr_factory_{this};
  };
 
@@ -222,7 +222,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
    explicit AccessibilityModeObserver(BrowserView* browser_view)
 --- a/chrome/browser/ui/views/frame/browser_view.h
 +++ b/chrome/browser/ui/views/frame/browser_view.h
-@@ -86,6 +86,7 @@ class MultiContentsView;
+@@ -85,6 +85,7 @@ class MultiContentsView;
  class ProjectsPanelView;
  class ScrimView;
  class SidePanel;
@@ -231,7 +231,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
  class TabSearchBubbleHost;
  class TabStrip;
 @@ -590,6 +591,10 @@ class BrowserView : public BrowserWindow
-   bool IsBorderlessModeEnabled() const override;
+   bool IsUnframedModeEnabled() const override;
    void ShowChromeLabs() override;
    BrowserView* AsBrowserView() override;
 +
@@ -241,15 +241,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
    SharingDialog* ShowSharingDialog(content::WebContents* contents,
                                     SharingDialogData data) override;
    void ShowUpdateChromeDialog() override;
-@@ -873,6 +878,7 @@ class BrowserView : public BrowserWindow
+@@ -872,6 +877,7 @@ class BrowserView : public BrowserWindow
    friend class BrowserViewLayoutDelegateImpl;
    friend class BrowserViewLayoutDelegateImplOld;
    friend class BrowserViewLayoutDelegateImplBrowsertest;
 +  friend class TabCyclingEventHandler;
    friend class TopControlsSlideControllerTest;
    FRIEND_TEST_ALL_PREFIXES(BrowserViewTest, BrowserView);
    FRIEND_TEST_ALL_PREFIXES(BrowserViewTest, AccessibleWindowTitle);
-@@ -1457,6 +1463,8 @@ class BrowserView : public BrowserWindow
+@@ -1456,6 +1462,8 @@ class BrowserView : public BrowserWindow
                  TabStripAndWebAppViewsReparentedState::kMaxValue>
        tab_strip_web_apps_reparented_state_;
 

patches/bromite/disable-fetching-field-trials.patch

@@ -10,7 +10,7 @@ Subject: Disable fetching of all field trials
 
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
-@@ -62,7 +62,7 @@ public abstract class ChromeFeatureList
+@@ -61,7 +61,7 @@ public abstract class ChromeFeatureList
       * |kFeaturesExposedToJava| in chrome/browser/flags/android/chrome_feature_list.cc
       */
      public static String getFieldTrialParamByFeature(String featureName, String paramName) {
@@ -19,7 +19,7 @@ Subject: Disable fetching of all field trials
      }
 
      /**
-@@ -74,8 +74,7 @@ public abstract class ChromeFeatureList
+@@ -73,8 +73,7 @@ public abstract class ChromeFeatureList
       */
      public static boolean getFieldTrialParamByFeatureAsBoolean(
              String featureName, String paramName, boolean defaultValue) {
@@ -29,7 +29,7 @@ Subject: Disable fetching of all field trials
      }
 
      /**
-@@ -87,8 +86,7 @@ public abstract class ChromeFeatureList
+@@ -86,8 +85,7 @@ public abstract class ChromeFeatureList
       */
      public static int getFieldTrialParamByFeatureAsInt(
              String featureName, String paramName, int defaultValue) {
@@ -39,7 +39,7 @@ Subject: Disable fetching of all field trials
      }
 
      /**
-@@ -100,8 +98,7 @@ public abstract class ChromeFeatureList
+@@ -99,8 +97,7 @@ public abstract class ChromeFeatureList
       */
      public static double getFieldTrialParamByFeatureAsDouble(
              String featureName, String paramName, double defaultValue) {