diff --git a/infra/test_build_args.gn b/infra/DEBUG/test_build_args.gn similarity index 100% rename from infra/test_build_args.gn rename to infra/DEBUG/test_build_args.gn diff --git a/infra/test_build_win_args.gn b/infra/DEBUG/test_build_win_args.gn similarity index 100% rename from infra/test_build_win_args.gn rename to infra/DEBUG/test_build_win_args.gn diff --git a/other/thorium-2024-ui.patch b/other/thorium-2024-ui.patch index e8301b54..75ffe2dd 100644 --- a/other/thorium-2024-ui.patch +++ b/other/thorium-2024-ui.patch @@ -784,7 +784,7 @@ index b57fb5baa52a7..4fc9467f16b6c 100644 + // Besides the frame border, there's empty space atop the window in restored + // mode, to use to drag the window around. + constexpr int kNonClientRestoredExtraThickness = 8; -+ const int thickness = kNonClientRestoredExtraThickness; ++ int thickness = kNonClientRestoredExtraThickness; + if (EverHasVisibleBackgroundTabShapes() && features::IsThorium2024()) { + thickness = + std::max(thickness, BrowserNonClientFrameView::kMinimumDragHeight); diff --git a/src/BUILD.gn b/src/BUILD.gn index f4fbaf51..f6fd0d35 100644 --- a/src/BUILD.gn +++ b/src/BUILD.gn @@ -87,7 +87,14 @@ group("thorium") { } if (is_linux || is_chromeos) { - deps += [ "//sandbox/linux:chrome_sandbox" ] + deps += [ ":thorium_sandbox" ] + } +} + +# Simply to rename the sandbox target +group("thorium_sandbox") { + if (is_linux || is_chromeos) { + deps = [ "//sandbox/linux:chrome_sandbox" ] } } @@ -110,7 +117,7 @@ group("thorium_all") { } if (is_linux) { - deps += [ "//sandbox/linux:chrome_sandbox" ] + deps += [ ":thorium_sandbox" ] } if (is_win) { diff --git a/src/chrome/browser/thorium_flag_entries.h b/src/chrome/browser/thorium_flag_entries.h index de937a62..63a0781b 100644 --- a/src/chrome/browser/thorium_flag_entries.h +++ b/src/chrome/browser/thorium_flag_entries.h @@ -130,7 +130,7 @@ #if !BUILDFLAG(IS_ANDROID) {"disable-download-bubble", "Disable Download Bubble", - "When enabled, the traditional download shelf is used instead of the download bubble. Thorium flag", + "When enabled, the traditional download shelf is used instead of the download bubble in the toolbar. Thorium flag", kOsDesktop, SINGLE_VALUE_TYPE("disable-download-bubble")}, #endif // BUILDFLAG(IS_ANDROID) diff --git a/src/components/vector_icons/BUILD.gn b/src/components/vector_icons/BUILD.gn index 23261f9c..c7eaad43 100644 --- a/src/components/vector_icons/BUILD.gn +++ b/src/components/vector_icons/BUILD.gn @@ -247,8 +247,11 @@ aggregate_vector_icons("components_vector_icons") { ] if (is_thorium_build) { - sources += [ "thorium/reload_thorium.icon" ] - sources += [ "thorium/reload_chrome_refresh_thorium.icon" ] + sources += [ + "thorium/reload_thorium.icon", + "thorium/reload_chrome_refresh_thorium.icon", + "thorium/restore.icon" + ] } if (is_chromeos) { diff --git a/src/components/vector_icons/thorium/restore.icon b/src/components/vector_icons/thorium/restore.icon new file mode 100644 index 00000000..6d5f53e6 --- /dev/null +++ b/src/components/vector_icons/thorium/restore.icon @@ -0,0 +1,35 @@ +// Copyright 2024 The Chromium Authors and Alex313031 +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +CANVAS_DIMENSIONS, 20, +FILL_RULE_NONZERO, +MOVE_TO, 10, 17, +R_CUBIC_TO, -1.94f, 0, -3.6f, -0.68f, -4.96f, -2.04f, +CUBIC_TO, 3.68f, 13.6f, 3, 11.95f, 3, 10, +R_H_LINE_TO, 1.5f, +R_CUBIC_TO, 0, 1.52f, 0.54f, 2.81f, 1.61f, 3.89f, +CUBIC_TO, 7.19f, 14.96f, 8.48f, 15.5f, 10, 15.5f, +R_CUBIC_TO, 1.52f, 0, 2.81f, -0.54f, 3.89f, -1.61f, +CUBIC_TO, 14.96f, 12.81f, 15.5f, 11.52f, 15.5f, 10, +R_CUBIC_TO, 0, -1.52f, -0.54f, -2.81f, -1.61f, -3.89f, +CUBIC_TO, 12.81f, 5.04f, 11.52f, 4.5f, 10, 4.5f, +R_CUBIC_TO, -0.86f, 0, -1.66f, 0.18f, -2.39f, 0.54f, +ARC_TO, 5.33f, 5.33f, 0, 0, 0, 5.77f, 6.5f, +H_LINE_TO, 8, +V_LINE_TO, 8, +H_LINE_TO, 3, +V_LINE_TO, 3, +R_H_LINE_TO, 1.5f, +R_V_LINE_TO, 2.71f, +ARC_TO, 6.94f, 6.94f, 0, 0, 1, 6.89f, 3.73f, +CUBIC_TO, 7.84f, 3.24f, 8.88f, 3, 10, 3, +R_CUBIC_TO, 0.97f, 0, 1.88f, 0.18f, 2.73f, 0.56f, +R_CUBIC_TO, 0.85f, 0.37f, 1.59f, 0.87f, 2.22f, 1.5f, +R_ARC_TO, 7.05f, 7.05f, 0, 0, 1, 1.5f, 2.22f, +R_CUBIC_TO, 0.37f, 0.85f, 0.56f, 1.76f, 0.56f, 2.73f, +R_CUBIC_TO, 0, 0.97f, -0.18f, 1.88f, -0.56f, 2.73f, +R_ARC_TO, 7.05f, 7.05f, 0, 0, 1, -1.5f, 2.22f, +R_ARC_TO, 7.05f, 7.05f, 0, 0, 1, -2.22f, 1.5f, +ARC_TO, 6.73f, 6.73f, 0, 0, 1, 10, 17, +CLOSE