From e061852f468775704ceefe749e596c68523f4c0a Mon Sep 17 00:00:00 2001 From: Alexander Frick Date: Sun, 10 Nov 2024 02:24:28 -0600 Subject: [PATCH] M130 pre-stage --- infra/portable/THORIUM_SHELL.BAT | 2 +- .../extensions/component_extensions_allowlist/allowlist.cc | 7 +++++++ .../installer/launcher_support/chrome_launcher_support.cc | 2 +- src/components/vector_icons/back_arrow_chrome_refresh.icon | 4 ++-- .../vector_icons/forward_arrow_chrome_refresh.icon | 4 ++-- upstream_version.sh | 2 +- version.sh | 2 +- 7 files changed, 15 insertions(+), 8 deletions(-) diff --git a/infra/portable/THORIUM_SHELL.BAT b/infra/portable/THORIUM_SHELL.BAT index 5549e9a8..8ab3ca61 100644 --- a/infra/portable/THORIUM_SHELL.BAT +++ b/infra/portable/THORIUM_SHELL.BAT @@ -1 +1 @@ -START "" "%cd%\BIN\128.0.6613.194\thorium_shell.exe" --user-data-dir="%~dp0%\USER_DATA\thorium_shell" --allow-outdated-plugins --disable-logging --disable-breakpad --enable-experimental-web-platform-features --disable-encryption --disable-machine-id +START "" "%cd%\BIN\130.0.6723.125\thorium_shell.exe" --user-data-dir="%~dp0%\USER_DATA\thorium_shell" --allow-outdated-plugins --disable-logging --disable-breakpad --enable-experimental-web-platform-features --disable-encryption --disable-machine-id diff --git a/src/chrome/browser/extensions/component_extensions_allowlist/allowlist.cc b/src/chrome/browser/extensions/component_extensions_allowlist/allowlist.cc index 15818932..f1edd728 100644 --- a/src/chrome/browser/extensions/component_extensions_allowlist/allowlist.cc +++ b/src/chrome/browser/extensions/component_extensions_allowlist/allowlist.cc @@ -89,6 +89,10 @@ bool IsComponentExtensionAllowlisted(const std::string& extension_id) { return false; } +bool IsThoriumID(const std::string& extension_id) { + return extension_id == kThoriumHangoutsId; +} + bool IsComponentExtensionAllowlisted(int manifest_resource_id) { switch (manifest_resource_id) { // Please keep the list in alphabetical order. @@ -117,6 +121,9 @@ bool IsComponentExtensionAllowlisted(int manifest_resource_id) { #endif // BUILDFLAG(IS_CHROMEOS) return true; } + if (IsThoriumID) + return true; + } LOG(ERROR) << "Component extension with manifest resource id " << manifest_resource_id << " not in allowlist and is not being " diff --git a/src/chrome/installer/launcher_support/chrome_launcher_support.cc b/src/chrome/installer/launcher_support/chrome_launcher_support.cc index 5979df45..13728bbd 100644 --- a/src/chrome/installer/launcher_support/chrome_launcher_support.cc +++ b/src/chrome/installer/launcher_support/chrome_launcher_support.cc @@ -28,7 +28,7 @@ const wchar_t kUpdateClientsRegKey[] = L"Software\\Google\\Update\\Clients"; const wchar_t kBrowserAppGuid[] = L"{8A69D345-D564-463c-AFF1-A69D9E530F96}"; const wchar_t kSxSBrowserAppGuid[] = L"{4ea16ac7-fd5a-47c3-875b-dbf4a2008c20}"; #else -const wchar_t kInstallationRegKey[] = L"Software\\Chromium"; +const wchar_t kInstallationRegKey[] = L"Software\\Thorium"; #endif // Copied from util_constants.cc. diff --git a/src/components/vector_icons/back_arrow_chrome_refresh.icon b/src/components/vector_icons/back_arrow_chrome_refresh.icon index 799bddaa..48f36cb6 100644 --- a/src/components/vector_icons/back_arrow_chrome_refresh.icon +++ b/src/components/vector_icons/back_arrow_chrome_refresh.icon @@ -5,7 +5,7 @@ CANVAS_DIMENSIONS, 24, FILL_RULE_NONZERO, -MOVE_TO, 15.12f, 3.17f, +MOVE_TO, 14.80f, 3.17f, R_ARC_TO, 0.92f, 0.92f, 0, 1, 1, 1.3f, 1.3f, R_LINE_TO, -7.1f, 7.1f, R_CUBIC_TO, -0.24f, 0.24f, -0.24f, 0.63f, 0, 0.87f, @@ -13,5 +13,5 @@ R_LINE_TO, 7.1f, 7.1f, R_ARC_TO, 0.92f, 0.92f, 0, 1, 1, -1.3f, 1.3f, R_LINE_TO, -7.1f, -7.1f, R_ARC_TO, 2.45f, 2.45f, 0, 0, 1, 0, -3.47f, -R_LINE_TO, 7.1f, -7.1f, +//R_LINE_TO, 7.1f, -7.1f, CLOSE diff --git a/src/components/vector_icons/forward_arrow_chrome_refresh.icon b/src/components/vector_icons/forward_arrow_chrome_refresh.icon index efcc34dd..35591261 100644 --- a/src/components/vector_icons/forward_arrow_chrome_refresh.icon +++ b/src/components/vector_icons/forward_arrow_chrome_refresh.icon @@ -5,7 +5,7 @@ CANVAS_DIMENSIONS, 24, FILL_RULE_NONZERO, -MOVE_TO, 8.88f, 3.17f, +MOVE_TO, 9.20f, 3.17f, R_ARC_TO, 0.92f, 0.92f, 0, 0, 0, -1.3f, 1.3f, R_LINE_TO, 7.1f, 7.1f, R_CUBIC_TO, 0.24f, 0.24f, 0.24f, 0.63f, 0, 0.87f, @@ -13,5 +13,5 @@ R_LINE_TO, -7.1f, 7.1f, R_ARC_TO, 0.92f, 0.92f, 0, 1, 0, 1.3f, 1.3f, R_LINE_TO, 7.1f, -7.1f, R_ARC_TO, 2.45f, 2.45f, 0, 0, 0, 0, -3.47f, -LINE_TO, 8.88f, 3.17f, +//LINE_TO, 8.88f, 3.17f, CLOSE diff --git a/upstream_version.sh b/upstream_version.sh index 3c1a49af..834d44f3 100755 --- a/upstream_version.sh +++ b/upstream_version.sh @@ -36,7 +36,7 @@ else export CR_SRC_DIR fi -CR_VER="128.0.6613.194" +CR_VER="130.0.6723.125" export CR_VER && diff --git a/version.sh b/version.sh index f8107e7b..e88c825f 100755 --- a/version.sh +++ b/version.sh @@ -36,7 +36,7 @@ else export CR_SRC_DIR fi -THOR_VER="128.0.6613.194" +THOR_VER="130.0.6723.125" export THOR_VER &&