Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace com.apple.ReadingList by Reading List #16784

Merged
merged 1 commit into from
Jan 25, 2023
Merged

Conversation

spylogsster
Copy link
Contributor

@spylogsster spylogsster commented Jan 21, 2023

Resolves brave/brave-browser#27738

Submitter Checklist:

  • I confirm that no security/privacy review is needed, or that I have requested one
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally:
    • npm run test -- brave_browser_tests, npm run test -- brave_unit_tests wiki
    • npm run lint, npm run presubmit wiki, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

  • steps from issue

@spylogsster spylogsster self-assigned this Jan 21, 2023
@spylogsster spylogsster requested a review from a team as a code owner January 21, 2023 16:14
for (auto& item : bookmarks) {
for (auto& folder : item.path) {
if (folder == kSafariReadingListPath) {
folder = l10n_util::GetStringUTF16(IDS_BOOKMARKS_READING_LIST_GROUP);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: don't need return; here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Im not sure that we can have only one path

#include "src/chrome/utility/importer/safari_importer.mm"
#undef IDS_BOOKMARK_GROUP_FROM_SAFARI
#define IDS_BOOKMARK_GROUP_FROM_SAFARI GetBookmarkGroupFromSafariID()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need this define here? I think it doesn't have any meaning.

Copy link
Contributor Author

@spylogsster spylogsster Jan 25, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

src reviewers require to restore definitions state usually

@spylogsster spylogsster merged commit d3f34a4 into master Jan 25, 2023
@spylogsster spylogsster deleted the brave-27738 branch January 25, 2023 05:22
@spylogsster spylogsster added this to the 1.49.x - Nightly milestone Jan 25, 2023
@@ -22,6 +22,9 @@
<message name="IDS_BOOKMARK_GROUP" desc="The group name of bookmarks imported from a file">
Imported
</message>
<message name="IDS_BOOKMARKS_READING_LIST_GROUP" desc="The title of reading list folder in imported bookmarks.">
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

<!-- Bookmarks specific strings (included from generated_resources.grd). -->
<!--This file is created by l10nUtil.js. Do not edit manually.-->

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

com.apple.Reading List namespace shows up from Safari import
4 participants