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.

Sign up for GitHub

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

Replace com.apple.ReadingList by Reading List #16784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/bookmarks_strings.grdp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.-->

Reading List
</message>
</if>

<if expr="not use_titlecase">
Expand Down
31 changes: 31 additions & 0 deletions chromium_src/chrome/utility/importer/safari_importer.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,46 @@

#include <Cocoa/Cocoa.h>

#include <vector>

#include "base/files/file_util.h"
#include "base/logging.h"
#include "chrome/common/importer/imported_bookmark_entry.h"
#include "chrome/grit/generated_resources.h"
#include "chrome/utility/importer/safari_importer.h"
#include "ui/base/l10n/l10n_util.h"

namespace {

int GetBookmarkGroupFromSafariID() {
return IDS_BOOKMARK_GROUP_FROM_SAFARI;
}

constexpr char16_t kSafariReadingListPath[] = u"com.apple.ReadingList";

void CorrectSafariReadingListPath(
std::vector<ImportedBookmarkEntry>& bookmarks) {
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

}
}
}
}
} // namespace

#define fileSystemRepresentation fileSystemRepresentation]; \
int64_t file_size = 0; \
if (base::GetFileSize(base::FilePath(db_path), &file_size) && !file_size) { \
return false; \
} \
VLOG(1) << [favicons_db_path fileSystemRepresentation

#undef IDS_BOOKMARK_GROUP_FROM_SAFARI
#define IDS_BOOKMARK_GROUP_FROM_SAFARI GetBookmarkGroupFromSafariID()); \
CorrectSafariReadingListPath(bookmarks
#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 •
edited
Loading

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

#undef fileSystemRepresentation