Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 5f09697d authored by Carmelo Messina's avatar Carmelo Messina
Browse files

Patches for v144

parent c82c4d77
Loading
Loading
Loading
Loading
+5 −4
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../app/bookmarks/BookmarkActivity.java       |  32 ++
 .../native_page/NativePageFactory.java        |   9 +-
 chrome/browser/BUILD.gn                       |  11 +-
 .../bookmarks/android/bookmark_bridge.cc      | 192 ++++++++++++
 .../bookmarks/android/bookmark_bridge.cc      | 193 ++++++++++++
 .../bookmarks/android/bookmark_bridge.h       |  30 +-
 .../browser/bookmarks/BookmarkBridge.java     |  39 +++
 .../browser/bookmarks/BookmarkDelegate.java   |  10 +
@@ -51,7 +51,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ui/shell_dialogs/select_file_dialog_linux.cc  |   4 +
 ui/shell_dialogs/select_file_dialog_linux.h   |   2 +
 ui/shell_dialogs/select_file_dialog_win.cc    |   5 +
 40 files changed, 805 insertions(+), 24 deletions(-)
 40 files changed, 806 insertions(+), 24 deletions(-)
 create mode 100644 cromite_flags/chrome/browser/about_flags_cc/add-bookmark-import-export-actions.inc
 create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/add-bookmark-import-export-actions.inc
 create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/add-bookmark-import-export-actions.inc
@@ -322,7 +322,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
 }
 
 void BookmarkBridge::Destroy(JNIEnv* env) {
@@ -843,6 +869,172 @@ jint BookmarkBridge::GetTotalBookmarkCount(
@@ -843,6 +869,173 @@ jint BookmarkBridge::GetTotalBookmarkCount(
   return count;
 }
 
@@ -450,7 +450,8 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
+  }
+
+  std::vector<char> buffer(fileLength);
+  if (-1 == file.ReadAtCurrentPos(buffer.data(), fileLength)) {
+  base::span<uint8_t> buffer_span = base::as_writable_byte_span(buffer);
+  if (-1 == file.ReadAtCurrentPos(buffer_span)) {
+    select_file_dialog_->ShowToast("Could not read bookmarks file");
+    return "";
+  }
+2 −2
Original line number Diff line number Diff line
@@ -1554,7 +1554,7 @@ diff --git a/components/webui/flags/resources/experiment.html.ts b/components/we
   return html`<!--_html_template_start_-->
 <div class="experiment" id="${this.feature_.internal_name}">
-  <div class="flex-container">
+  <div class="flex-container" class="${(this.feature_.is_cromite && this.feature_.is_new ? "cromite " : "")
+  <div class="${"flex-container " + (this.feature_.is_cromite && this.feature_.is_new ? "cromite " : "")
+                                  + (this.feature_.is_default_value_on ? "experiment-on" : "")}">
     <div class="flex">
       ${this.showingSearchHit_? html`
+3 −11
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../bookmark_ui_operations_helper.cc          |  2 +
 .../bookmark_bar_page_handler.cc              |  2 +
 components/bookmark_bar_strings.grdp          |  6 +++
 .../bookmarks/browser/bookmark_codec.cc       | 15 ++++++-
 .../bookmarks/browser/bookmark_codec.cc       | 14 +++++-
 components/bookmarks/browser/bookmark_codec.h |  4 ++
 .../browser/bookmark_load_details.cc          | 15 +++++--
 .../bookmarks/browser/bookmark_load_details.h |  2 +
@@ -31,7 +31,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 components/bookmarks/browser/bookmark_uuids.h |  1 +
 components/bookmarks/browser/model_loader.cc  |  9 +++-
 .../bookmark_specifics_conversions.cc         |  1 +
 27 files changed, 252 insertions(+), 11 deletions(-)
 27 files changed, 251 insertions(+), 11 deletions(-)

diff --git a/chrome/android/java/res/values/ids.xml b/chrome/android/java/res/values/ids.xml
--- a/chrome/android/java/res/values/ids.xml
@@ -212,7 +212,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
   const BookmarkNode* reading_list_node =
       local_or_syncable_reading_list_manager_->GetRoot();
   if (IsPermanentFolderVisible(
@@ -1228,6 +1259,17 @@ void BookmarkBridge::GetBookmarksOfType(
@@ -1229,6 +1260,17 @@ void BookmarkBridge::GetBookmarksOfType(
   AddBookmarkNodesToBookmarkIdList(env, j_list, results);
 }
 
@@ -596,14 +596,6 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
 
   // Need to reset the title as the title is persisted and restored from
   // the file.
@@ -461,6 +473,7 @@ void BookmarkCodec::ReassignIDsIfRequired() {
   }
 
   nodes_requiring_id_reassignment_.clear();
+  ReassignIDsHelper(tabs_folder_node);
   ids_reassigned_ = true;
 }
 
diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmarks/browser/bookmark_codec.h
--- a/components/bookmarks/browser/bookmark_codec.h
+++ b/components/bookmarks/browser/bookmark_codec.h
+33 −5
Original line number Diff line number Diff line
@@ -31,16 +31,17 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 .../core/browsing_data_policies_utils.h       | 11 +++
 .../browsing_data/core/browsing_data_utils.cc | 31 ++++++++
 .../core/clear_browsing_data_tab.h            |  3 +-
 components/browsing_data/core/features.h      |  1 +
 components/browsing_data/core/pref_names.cc   | 17 ++++
 components/browsing_data/core/pref_names.h    | 10 +++
 components/favicon/core/favicon_database.cc   |  9 +++
 components/favicon/core/favicon_database.h    |  2 +
 components/favicon/core/favicon_database.h    |  3 +
 .../search_engines/template_url_service.cc    |  1 +
 content/browser/btm/btm_service_impl.cc       |  2 +-
 content/browser/storage_partition_impl.cc     |  1 +
 content/browser/storage_partition_impl.cc     |  2 +
 .../public/browser/browsing_data_remover.h    |  7 +-
 .../Add-setting-to-clear-data-on-exit.inc     |  8 ++
 36 files changed, 407 insertions(+), 34 deletions(-)
 37 files changed, 410 insertions(+), 34 deletions(-)
 create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentAtStart.java
 create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-setting-to-clear-data-on-exit.grdp
 create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Add-setting-to-clear-data-on-exit.inc
@@ -881,6 +882,17 @@ diff --git a/components/browsing_data/core/clear_browsing_data_tab.h b/component
 
 }  // namespace browsing_data
 
diff --git a/components/browsing_data/core/features.h b/components/browsing_data/core/features.h
--- a/components/browsing_data/core/features.h
+++ b/components/browsing_data/core/features.h
@@ -19,6 +19,7 @@ BASE_DECLARE_FEATURE(kBrowsingDataModel);
 // updates to history counter logic and removal of the bulk password deletion
 // option from the dialog.
 BASE_DECLARE_FEATURE(kDbdRevampDesktop);
+SET_CROMITE_FEATURE_DISABLED(kDbdRevampDesktop);
 
 // When enabled, calls to browsingData.removePasswords extension API would
 // result in an error response instead of a console warning.
diff --git a/components/browsing_data/core/pref_names.cc b/components/browsing_data/core/pref_names.cc
--- a/components/browsing_data/core/pref_names.cc
+++ b/components/browsing_data/core/pref_names.cc
@@ -957,7 +969,15 @@ diff --git a/components/favicon/core/favicon_database.cc b/components/favicon/co
diff --git a/components/favicon/core/favicon_database.h b/components/favicon/core/favicon_database.h
--- a/components/favicon/core/favicon_database.h
+++ b/components/favicon/core/favicon_database.h
@@ -33,6 +33,8 @@ namespace favicon {
@@ -9,6 +9,7 @@
 #include <optional>
 #include <vector>
 
+#include "base/feature_list.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "components/favicon/core/favicon_types.h"
@@ -33,6 +34,8 @@ namespace favicon {
 // All earlier updates are ignored.
 static const int kFaviconUpdateLastRequestedAfterDays = 10;
 
@@ -992,7 +1012,15 @@ diff --git a/content/browser/btm/btm_service_impl.cc b/content/browser/btm/btm_s
diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage_partition_impl.cc
--- a/content/browser/storage_partition_impl.cc
+++ b/content/browser/storage_partition_impl.cc
@@ -1557,6 +1557,7 @@ void StoragePartitionImpl::Initialize(
@@ -19,6 +19,7 @@
 #include "base/containers/contains.h"
 #include "base/dcheck_is_on.h"
 #include "base/feature_list.h"
+#include "base/files/file_util.h"
 #include "base/functional/bind.h"
 #include "base/functional/callback_helpers.h"
 #include "base/functional/concurrent_closures.h"
@@ -1557,6 +1558,7 @@ void StoragePartitionImpl::Initialize(
                             .AppendASCII("Code Cache");
     }
     DCHECK_GE(settings.size_in_bytes(), 0);
+21 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ Conditional immediate support is disabled.
License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
---
 .../settings/PasswordSettings.java            | 27 +++++++++++++++++
 .../touch_to_fill_controller.cc               |  2 ++
 ...etting-to-enable-Credman-for-passkeys.grdp | 12 ++++++++
 .../webauthn/AuthenticatorImpl.java           | 29 +++++++------------
 .../components/webauthn/WebauthnFeatures.java |  2 ++
@@ -20,7 +21,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 components/webauthn/features.h                |  3 ++
 device/fido/features.cc                       |  2 ++
 .../authentication_credentials_container.cc   |  5 ++++
 10 files changed, 73 insertions(+), 37 deletions(-)
 11 files changed, 75 insertions(+), 37 deletions(-)
 create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-setting-to-enable-Credman-for-passkeys.grdp

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
@@ -81,6 +82,25 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage
     private void displayManageAccountLink() {
         SyncService syncService = SyncServiceFactory.getForProfile(getProfile());
         if (syncService == null || !syncService.isEngineInitialized()) {
diff --git a/chrome/browser/touch_to_fill/password_manager/touch_to_fill_controller.cc b/chrome/browser/touch_to_fill/password_manager/touch_to_fill_controller.cc
--- a/chrome/browser/touch_to_fill/password_manager/touch_to_fill_controller.cc
+++ b/chrome/browser/touch_to_fill/password_manager/touch_to_fill_controller.cc
@@ -312,6 +312,7 @@ void TouchToFillController::Reset() {
   }
   visibility_controller_->Reset();
   credentials_.clear();
+  cred_man_delegate_ = nullptr;
 }
 
 void TouchToFillController::ActionCompleted() {
@@ -319,6 +320,7 @@ void TouchToFillController::ActionCompleted() {
     visibility_controller_->SetShown();
   }
   ttf_delegate_.reset();
+  cred_man_delegate_ = nullptr;
 }
 
 DisplayTarget TouchToFillController::GetResponsibleDisplayTarget(
diff --git a/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-setting-to-enable-Credman-for-passkeys.grdp b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-setting-to-enable-Credman-for-passkeys.grdp
new file mode 100644
--- /dev/null
Loading