Merge branch '1695-master-fixes' into 'master'

if [ ! -d "$chromium_dir" ]; then

    chromium_dir=$root_dir

fi

chromium_version="117.0.5938.153"

chromium_version="117.0.5938.156"

chromium_code=$(echo "$chromium_version" | tr -d '.' | cut -c5-)

clean=0

gsync=0

build() {

    echo ">> [$(date)] Head commit: $(git show -s --format=%s)"

    apks="ChromePublic SystemWebView TrichromeChrome32 TrichromeLibrary32 TrichromeWebView32 TrichromeChrome6432 TrichromeLibrary6432 TrichromeWebView6432 MonochromePublic"

    apks="TrichromeChrome TrichromeLibrary TrichromeWebView TrichromeChrome6432 \

        TrichromeLibrary6432 TrichromeWebView6432"

    build_args="$(cat "${root_dir}"/build/browser.gn_args) target_cpu=\"${1}\" "

    apk_arch=${1}

    build_args+=' android_default_version_name="'$chromium_version'"'

    build_args+=' android_default_version_code="'$code'"'

    if [ $clean -eq 1 ] && [ -d "out/$1" ]; then

    if [ $clean -eq 1 ]; then

        if [ -d "out/$1" ]; then

            rm -rf "out/$1"

        fi

        if [ -d "${root_dir}/apks/${apk_arch}" ]; then

            rm -rf "${root_dir}/apks/${apk_arch}"

        fi

    fi

    build_args+=' cc_wrapper="ccache"'

    echo ">> [$(date)] Building chromium $chromium_version for $1"

    gn gen "out/$1" --args="$build_args"

    build_targets="chrome_public_apk system_webview_apk monochrome_public_apk"

    if [ $1 '==' "x64" ] || [ $1 '==' "arm64" ]; then

        build_targets="$build_targets trichrome_webview_32_apk trichrome_chrome_32_apk trichrome_library_32_apk \

                trichrome_webview_64_32_apk trichrome_chrome_64_32_apk trichrome_library_64_32_apk"

        build_targets="trichrome_webview_64_32_apk trichrome_chrome_64_32_apk trichrome_library_64_32_apk"

    else

        build_targets="trichrome_webview_apk trichrome_chrome_apk trichrome_library_apk"

    fi

    ninja -C out/$1 $build_targets

    for apk in $apks; do

        if [ -f "out/${1}/apks/$apk.apk" ]; then

            echo ">> [$(date)] Moving $apk for ${apk_arch} to output folder"

            if [[ "$apk.apk" == *Public.apk ]] || [[ "$apk.apk" == SystemWebView.apk ]] || [[ "$apk.apk" == *6432.apk ]]; then

            mkdir -p "${root_dir}/apks/${apk_arch}"

            mv "out/${1}/apks/$apk.apk" "${root_dir}/apks/${apk_arch}/$(echo "$apk" | sed 's/[0-9]*//g').apk"

            else

                if [ "$1" = "x64" ]; then

                    mkdir -p "${root_dir}/apks/x86"

                    mv "out/${1}/apks/$apk.apk" "${root_dir}/apks/x86/$(echo "$apk" | sed 's/[0-9]*//g').apk"

                elif [ "$1" = "arm64" ]; then

                    mkdir -p "${root_dir}/apks/arm"

                    mv "out/${1}/apks/$apk.apk" "${root_dir}/apks/arm/$(echo "$apk" | sed 's/[0-9]*//g').apk"

                fi

            fi

        fi

    done

}

    echo ">> [$(date)] Syncing chromium $chromium_version"

    cd $chromium_dir

    gclient_config

    if [ -d "$chromium_dir/src" ]; then

        cd $chromium_dir/src

        git fetch origin refs/tags/$chromium_version

        git reset --hard FETCH_HEAD

    fi

    if [ $history -eq 1 ]; then

        gclient sync -D --nohooks -R -r $chromium_version

        gclient sync -D --nohooks -R

    else

        gclient sync --no-history -D --nohooks -R -r $chromium_version

        gclient sync --no-history -D --nohooks -R

    fi

    gclient runhooks

    patch

}

gclient_config() {

    url=https://github.com/chromium/chromium.git

    commit_hash=$(git ls-remote --refs $url refs/tags/$chromium_version | awk '{print $1}')

    cat <<EOF > "$chromium_dir/.gclient"

solutions = [{

    "url": "https://github.com/chromium/chromium",

    "url": "$url@$commit_hash",

    "managed": False,

    "name": "src",

    "custom_deps": {},

    "custom_hooks": [],

    "custom_vars": {}

}]

From b2bb3220b21a9cff8f15a278da5f27b38fc18313 Mon Sep 17 00:00:00 2001

From: uazo <uazo@users.noreply.github.com>

Date: Sat, 7 Nov 2020 21:59:18 +0000

Subject: [PATCH 03/17] Add autoplay site setting

Subject: Add autoplay site setting

Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html

License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html

Require: Content-settings-infrastructure.patch

Change-Id: I0800ab1fc452d0a57932b7e0653a353c3fdf464c

---

 .../res/drawable-hdpi/settings_autoplay.png   | Bin 0 -> 456 bytes

 .../res/drawable-mdpi/settings_autoplay.png   | Bin 0 -> 296 bytes

diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/impl/BromiteAutoplayContentSetting.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/impl/BromiteAutoplayContentSetting.java

new file mode 100644

index 0000000000000..e80c419f231a7

--- /dev/null

+++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/impl/BromiteAutoplayContentSetting.java

@@ -0,0 +1,92 @@

+}

diff --git a/components/browser_ui/strings/bromite_content_settings/autoplay.grdp b/components/browser_ui/strings/bromite_content_settings/autoplay.grdp

new file mode 100644

index 0000000000000..03a149f683fb9

--- /dev/null

+++ b/components/browser_ui/strings/bromite_content_settings/autoplay.grdp

@@ -0,0 +1,21 @@

+</grit-part>

diff --git a/components/content_settings/core/browser/bromite_content_settings/autoplay.inc b/components/content_settings/core/browser/bromite_content_settings/autoplay.inc

new file mode 100644

index 0000000000000..8d7a0eb1a4c5c

--- /dev/null

+++ b/components/content_settings/core/browser/bromite_content_settings/autoplay.inc

@@ -0,0 +1,12 @@

+    .set_blocked_exceptions_ui(IDS_SETTINGS_SITE_SETTINGS_AUTOPLAY_BLOCKED_EXCEPTIONS)

+    .set_mid_sentence_ui(IDS_AUTOPLAY_PERMISSION_TITLE);

diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc

index c2e63e4c40fba..5b2ba6f26d785 100644

--- a/components/content_settings/core/browser/content_settings_registry.cc

+++ b/components/content_settings/core/browser/content_settings_registry.cc

@@ -246,7 +246,7 @@ void ContentSettingsRegistry::Init() {

            /*valid_settings=*/{CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK},

            WebsiteSettingsInfo::TOP_ORIGIN_ONLY_SCOPE,

diff --git a/third_party/blink/renderer/core/html/media/autoplay_policy.cc b/third_party/blink/renderer/core/html/media/autoplay_policy.cc

index 3a7a3d92f074c..ad6d08e8a59cf 100644

--- a/third_party/blink/renderer/core/html/media/autoplay_policy.cc

+++ b/third_party/blink/renderer/core/html/media/autoplay_policy.cc

@@ -8,6 +8,7 @@

   if (!element_->GetExecutionContext() ||

       element_->GetExecutionContext()->IsSandboxed(

diff --git a/third_party/blink/renderer/core/html/media/autoplay_policy.h b/third_party/blink/renderer/core/html/media/autoplay_policy.h

index 408935f82be91..62b9ac59a14b7 100644

--- a/third_party/blink/renderer/core/html/media/autoplay_policy.h

+++ b/third_party/blink/renderer/core/html/media/autoplay_policy.h

@@ -133,6 +133,10 @@ class CORE_EXPORT AutoplayPolicy final

   bool IsOrWillBeAutoplayingMutedInternal(bool muted) const;

--

2.34.1

2.25.1

From: uazo <uazo@users.noreply.github.com>

Date: Tue, 12 Sep 2023 12:39:23 +0000

Subject: Enable ImprovedBookmarks by default

License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html

---

 chrome/android/java/res/layout/bookmark_search_box_row.xml  | 6 +++---

 .../chromium/chrome/browser/bookmarks/BookmarkFeatures.java | 2 +-

 .../browser/bookmarks/BookmarkSearchBoxRowViewBinder.java   | 2 ++

 .../chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java  | 2 +-

 .../chromium/chrome/browser/bookmarks/BookmarkUtils.java    | 3 ++-

 chrome/browser/flags/android/chrome_feature_list.cc         | 2 +-

 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/chrome/android/java/res/layout/bookmark_search_box_row.xml b/chrome/android/java/res/layout/bookmark_search_box_row.xml

--- a/chrome/android/java/res/layout/bookmark_search_box_row.xml

+++ b/chrome/android/java/res/layout/bookmark_search_box_row.xml

@@ -31,9 +31,9 @@ found in the LICENSE file.

       android:textAppearance="@style/TextAppearance.TextLarge.Primary" />

     <LinearLayout

-        android:layout_height="48dp"

+        android:layout_height="wrap_content"

         android:layout_width="match_parent"

-        android:layout_marginTop="6dp"

+        android:layout_marginTop="0dp"

         android:orientation="horizontal" >

     <org.chromium.components.browser_ui.widget.chips.ChipView

@@ -43,4 +43,4 @@ found in the LICENSE file.

     </LinearLayout>

-</org.chromium.chrome.browser.bookmarks.BookmarkSearchBoxRow>

\ No newline at end of file

+</org.chromium.chrome.browser.bookmarks.BookmarkSearchBoxRow>

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkFeatures.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkFeatures.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkFeatures.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkFeatures.java

@@ -14,7 +14,7 @@ import org.chromium.chrome.browser.flags.MutableFlagWithSafeDefault;

  */

 public class BookmarkFeatures {

     private static final MutableFlagWithSafeDefault sAndroidImprovedBookmarksFlag =

-            new MutableFlagWithSafeDefault(ChromeFeatureList.ANDROID_IMPROVED_BOOKMARKS, false);

+            new MutableFlagWithSafeDefault(ChromeFeatureList.ANDROID_IMPROVED_BOOKMARKS, true);

     /** Returns whether an additional "add bookmark" item should be in the overflow menu. */

     public static boolean isBookmarkMenuItemAsDedicatedRowEnabled() {

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSearchBoxRowViewBinder.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSearchBoxRowViewBinder.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSearchBoxRowViewBinder.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSearchBoxRowViewBinder.java

@@ -5,6 +5,7 @@

 package org.chromium.chrome.browser.bookmarks;

 import android.view.View;

+import android.view.ViewGroup;

 import androidx.annotation.DrawableRes;

 import androidx.annotation.StringRes;

@@ -20,6 +21,7 @@ class BookmarkSearchBoxRowViewBinder {

     static void bind(PropertyModel model, View view, PropertyKey key) {

         BookmarkSearchBoxRow row = (BookmarkSearchBoxRow) view;

         ChipView shoppingChip = view.findViewById(R.id.shopping_filter_chip);

+        shoppingChip.setVisibility(ViewGroup.GONE);

         if (key == BookmarkSearchBoxRowProperties.QUERY_CALLBACK) {

             row.setQueryCallback(model.get(BookmarkSearchBoxRowProperties.QUERY_CALLBACK));

         } else if (key == BookmarkSearchBoxRowProperties.SHOPPING_CHIP_VISIBILITY) {

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java

@@ -18,7 +18,7 @@ import java.lang.annotation.RetentionPolicy;

  */

 public class BookmarkUiPrefs {

     private static final @BookmarkRowDisplayPref int INITIAL_BOOKMARK_ROW_DISPLAY_PREF =

-            BookmarkRowDisplayPref.VISUAL;

+            BookmarkRowDisplayPref.COMPACT;

     private static final @BookmarkRowSortOrder int INITIAL_BOOKMARK_ROW_SORT_ORDER =

             BookmarkRowSortOrder.REVERSE_CHRONOLOGICAL;

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java

@@ -38,6 +38,7 @@ import org.chromium.chrome.browser.app.bookmarks.BookmarkAddEditFolderActivity;

 import org.chromium.chrome.browser.app.bookmarks.BookmarkEditActivity;

 import org.chromium.chrome.browser.app.bookmarks.BookmarkFolderPickerActivity;

 import org.chromium.chrome.browser.app.bookmarks.BookmarkFolderSelectActivity;

+import org.chromium.chrome.browser.bookmarks.BookmarkFeatures;

 import org.chromium.chrome.browser.bookmarks.BookmarkUiPrefs.BookmarkRowDisplayPref;

 import org.chromium.chrome.browser.commerce.ShoppingServiceFactory;

 import org.chromium.chrome.browser.document.ChromeLauncherActivity;

@@ -405,7 +406,7 @@ public class BookmarkUtils {

             RecordUserAction.record("MobileBookmarkManagerReopenBookmarksInSameSession");

         }

-        if (DeviceFormFactor.isNonMultiDisplayContextOnTablet(context)) {

+        if (BookmarkFeatures.isAndroidImprovedBookmarksEnabled() || DeviceFormFactor.isNonMultiDisplayContextOnTablet(context)) {

             showBookmarkManagerOnTablet(context,

                     activity == null ? null : activity.getComponentName(), url, isIncognito);

         } else {

diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc

--- a/chrome/browser/flags/android/chrome_feature_list.cc

+++ b/chrome/browser/flags/android/chrome_feature_list.cc

@@ -495,7 +495,7 @@ BASE_FEATURE(kAndroidSearchEngineChoiceNotification,

 BASE_FEATURE(kAndroidImprovedBookmarks,

              "AndroidImprovedBookmarks",

-             base::FEATURE_DISABLED_BY_DEFAULT);

+             base::FEATURE_ENABLED_BY_DEFAULT);

 BASE_FEATURE(kAnimatedImageDragShadow,

              "AnimatedImageDragShadow",

--

2.25.1

Enable-third-party-storage-partitioning.patch

Restore-adaptive-button-in-top-toolbar-customization.patch

bromite-build-utils.patch

Enable-ImprovedBookmarks-by-default.patch

Add-autoplay-site-setting.patch

From a177f67795435619d7c7cbfa0fda4db32773f30a Mon Sep 17 00:00:00 2001

From a2b03c8888b091ffd173ddeb6dd990b0cc28b271 Mon Sep 17 00:00:00 2001

From: fgei <fgei@gmail.com>

Date: Tue, 21 Feb 2023 02:02:40 +0000

Subject: [PATCH 1/3] Disable Play services dependent password manager feature

Subject: [PATCH 1/8] Disable Play services dependent password manager feature

 by default

---