mirror of
https://github.com/morgan9e/helium
synced 2026-04-14 00:14:20 +09:00
merge: update to ungoogled-chromium 136.0.7103.92
This commit is contained in:
@@ -1 +1 @@
|
||||
136.0.7103.59
|
||||
136.0.7103.92
|
||||
|
||||
@@ -14049,6 +14049,7 @@ third_party/sqlite/src/amalgamation/sqlite3.c
|
||||
third_party/sqlite/src/amalgamation_dev/shell/shell.c
|
||||
third_party/sqlite/src/amalgamation_dev/sqlite3.c
|
||||
third_party/sqlite/src/ext/misc/zipfile.c
|
||||
third_party/sqlite/src/ext/wasm/README-dist.txt
|
||||
third_party/sqlite/src/ext/wasm/api/sqlite3-opfs-async-proxy.js
|
||||
third_party/sqlite/src/ext/wasm/api/sqlite3-worker1-promiser.c-pp.js
|
||||
third_party/sqlite/src/ext/wasm/index-dist.html
|
||||
@@ -14057,7 +14058,6 @@ third_party/sqlite/src/src/date.c
|
||||
third_party/sqlite/src/src/main.c
|
||||
third_party/sqlite/src/src/os_unix.c
|
||||
third_party/sqlite/src/src/pager.c
|
||||
third_party/sqlite/src/vsixtest/MainPage.xaml.cpp
|
||||
third_party/swiftshader/.vscode/tasks.json
|
||||
third_party/swiftshader/AUTHORS.txt
|
||||
third_party/swiftshader/CMakeLists.txt
|
||||
|
||||
@@ -385,21 +385,21 @@
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
--- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
|
||||
+++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
|
||||
@@ -1234,15 +1234,4 @@ void BookmarkMenuDelegate::BuildOtherNod
|
||||
ui::ImageModel bookmarks_side_panel_icon = ui::ImageModel::FromVectorIcon(
|
||||
kBookmarksSidePanelIcon, ui::kColorMenuIcon,
|
||||
ui::SimpleMenuModel::kDefaultIconSize);
|
||||
- menu->AppendMenuItem(
|
||||
- IDC_SHOW_BOOKMARK_SIDE_PANEL,
|
||||
- l10n_util::GetStringUTF16(IDS_BOOKMARKS_ALL_BOOKMARKS_OPEN_SIDE_PANEL),
|
||||
@@ -1237,12 +1237,14 @@ void BookmarkMenuDelegate::BuildOtherNod
|
||||
menu->AppendMenuItem(
|
||||
IDC_SHOW_BOOKMARK_SIDE_PANEL,
|
||||
l10n_util::GetStringUTF16(IDS_BOOKMARKS_ALL_BOOKMARKS_OPEN_SIDE_PANEL),
|
||||
- bookmarks_side_panel_icon);
|
||||
- bool other_folder_children_count =
|
||||
- GetBookmarkMergedSurfaceService()->GetChildrenCount(
|
||||
- BookmarkParentFolder::OtherFolder());
|
||||
- if (other_folder_children_count) {
|
||||
- menu->AppendSeparator();
|
||||
- other_node_menu_separator_ = menu->GetSubmenu()->children().back().get();
|
||||
- }
|
||||
+ bookmarks_side_panel_icon)->SetVisible(false);
|
||||
+
|
||||
bool other_folder_children_count =
|
||||
GetBookmarkMergedSurfaceService()->GetChildrenCount(
|
||||
BookmarkParentFolder::OtherFolder());
|
||||
if (other_folder_children_count) {
|
||||
menu->AppendSeparator();
|
||||
other_node_menu_separator_ = menu->GetSubmenu()->children().back().get();
|
||||
+ other_node_menu_separator_->SetVisible(false);
|
||||
}
|
||||
}
|
||||
--- a/chrome/browser/ui/views/location_bar/cookie_controls/cookie_controls_content_view.cc
|
||||
+++ b/chrome/browser/ui/views/location_bar/cookie_controls/cookie_controls_content_view.cc
|
||||
|
||||
@@ -11357,8 +11357,8 @@ third_party/sqlite/fuzz/lpm_fuzzer_seed_corpus/corpus_queries6
|
||||
third_party/sqlite/fuzz/lpm_fuzzer_seed_corpus/corpus_queries7
|
||||
third_party/sqlite/fuzz/lpm_fuzzer_seed_corpus/corpus_queries8
|
||||
third_party/sqlite/fuzz/lpm_fuzzer_seed_corpus/corpus_queries9
|
||||
third_party/sqlite/src/ext/recover/recovercorrupt2.test
|
||||
third_party/sqlite/src/tool/win/sqlite.vsix
|
||||
third_party/sqlite/src/vsixtest/vsixtest_TemporaryKey.pfx
|
||||
third_party/swiftshader/tests/kokoro/gcp_ubuntu/clang+llvm-11.0.1-x86_64-linux-gnu-ubuntu-16.04.tar.xz.sig
|
||||
third_party/swiftshader/tests/kokoro/gcp_ubuntu/tstellar-gpg-key.asc
|
||||
third_party/swiftshader/third_party/SPIRV-Tools/test/fuzzers/corpora/spv/graphicsfuzz_000.spv
|
||||
|
||||
@@ -1 +1 @@
|
||||
1
|
||||
2
|
||||
|
||||
Reference in New Issue
Block a user