0

[B4RL] Add Reading List to the Batch Upload dialog available data types

Bug: 328400800
Change-Id: I748e5267321a447c88aa7978e330e0b7dbe635bd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6517873
Reviewed-by: Ryan Sultanem <rsult@google.com>
Commit-Queue: Mahmoud Rashad <mmrashad@google.com>
Cr-Commit-Position: refs/heads/main@{#1456985}
This commit is contained in:
Mahmoud Rashad
2025-05-07 07:31:40 -07:00
committed by Chromium LUCI CQ
parent 5c61751af2
commit 9478faa514
5 changed files with 16 additions and 1 deletions

@ -1039,6 +1039,13 @@
other {Bookmarks ({SELECTED_ITEMS})} other {Bookmarks ({SELECTED_ITEMS})}
} }
</message> </message>
<message name="IDS_BATCH_UPLOAD_SECTION_TITLE_READING_LIST" desc="Title of the Reading list section in the Batch Upload dialog. This dialog appears when the user clicks on an informational message about items saved only to their device. The title of the dialog is Save items in account. The list of items has sections for each applicable data type: Passwords, Bookmarks, and more. This section shows the number of selected items in the section of the dialog, if any.">
{SELECTED_ITEMS, plural,
=0 {Reading list}
=1 {Reading list ({SELECTED_ITEMS})}
other {Reading list ({SELECTED_ITEMS})}
}
</message>
<message name="IDS_BATCH_UPLOAD_SECTION_TITLE_ADDRESSES" desc="Title of the Addresses section in the Batch Upload dialog. This dialog appears when the user clicks on an informational message about items saved only to their device. The title of the dialog is Save items in account. The list of items has sections for each applicable data type: Passwords, Bookmarks, and more. This section shows the number of selected items in the section of the dialog, if any."> <message name="IDS_BATCH_UPLOAD_SECTION_TITLE_ADDRESSES" desc="Title of the Addresses section in the Batch Upload dialog. This dialog appears when the user clicks on an informational message about items saved only to their device. The title of the dialog is Save items in account. The list of items has sections for each applicable data type: Passwords, Bookmarks, and more. This section shows the number of selected items in the section of the dialog, if any.">
{SELECTED_ITEMS, plural, {SELECTED_ITEMS, plural,
=0 {Addresses} =0 {Addresses}

@ -0,0 +1 @@
fa546078bc537e6d11cb4d7b18c1e2367c6a6715

@ -35,11 +35,14 @@ constexpr base::TimeDelta kBatchUploadAvatarButtonOverrideTextDuration =
// This list contains all the data types that are available for the Batch Upload // This list contains all the data types that are available for the Batch Upload
// dialog. Data types should not be repeated and the list is ordered based on // dialog. Data types should not be repeated and the list is ordered based on
// the priority of showing in the dialog. // the priority of showing in the dialog.
const std::array<syncer::DataType, 4> kBatchUploadAvailableTypesOrder{ const std::array<syncer::DataType, 5> kBatchUploadAvailableTypesOrder{
// clang-format off
syncer::DataType::PASSWORDS, syncer::DataType::PASSWORDS,
syncer::DataType::BOOKMARKS, syncer::DataType::BOOKMARKS,
syncer::DataType::READING_LIST,
syncer::DataType::CONTACT_INFO, syncer::DataType::CONTACT_INFO,
syncer::DataType::THEMES, syncer::DataType::THEMES,
// clang-format on
}; };
// Returns the list of data descriptions in `local_data_descriptions_map` // Returns the list of data descriptions in `local_data_descriptions_map`

@ -216,6 +216,7 @@ TEST_F(BatchUploadServiceTest, LocalDataForAllAvailableTypesMainOrder) {
GetLocalDataDescriptions( GetLocalDataDescriptions(
syncer::DataTypeSet{ syncer::DataTypeSet{
syncer::DataType::PASSWORDS, syncer::DataType::BOOKMARKS, syncer::DataType::PASSWORDS, syncer::DataType::BOOKMARKS,
syncer::DataType::READING_LIST,
syncer::DataType::CONTACT_INFO, syncer::DataType::THEMES}, syncer::DataType::CONTACT_INFO, syncer::DataType::THEMES},
_)) _))
.Times(1); .Times(1);
@ -223,6 +224,7 @@ TEST_F(BatchUploadServiceTest, LocalDataForAllAvailableTypesMainOrder) {
std::vector<syncer::LocalDataDescription> expected_descriptions{ std::vector<syncer::LocalDataDescription> expected_descriptions{
GetReturnDescription(syncer::PASSWORDS), GetReturnDescription(syncer::PASSWORDS),
GetReturnDescription(syncer::BOOKMARKS), GetReturnDescription(syncer::BOOKMARKS),
GetReturnDescription(syncer::READING_LIST),
GetReturnDescription(syncer::CONTACT_INFO), GetReturnDescription(syncer::CONTACT_INFO),
GetReturnDescription(syncer::THEMES), GetReturnDescription(syncer::THEMES),
}; };

@ -296,6 +296,8 @@ int BatchUploadHandler::GetTypeSectionTitleId(syncer::DataType type) {
return IDS_BATCH_UPLOAD_SECTION_TITLE_PASSWORDS; return IDS_BATCH_UPLOAD_SECTION_TITLE_PASSWORDS;
case syncer::DataType::BOOKMARKS: case syncer::DataType::BOOKMARKS:
return IDS_BATCH_UPLOAD_SECTION_TITLE_BOOKMARKS; return IDS_BATCH_UPLOAD_SECTION_TITLE_BOOKMARKS;
case syncer::DataType::READING_LIST:
return IDS_BATCH_UPLOAD_SECTION_TITLE_READING_LIST;
case syncer::DataType::CONTACT_INFO: case syncer::DataType::CONTACT_INFO:
return IDS_BATCH_UPLOAD_SECTION_TITLE_ADDRESSES; return IDS_BATCH_UPLOAD_SECTION_TITLE_ADDRESSES;
case syncer::DataType::THEMES: case syncer::DataType::THEMES: