Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1155)

Unified Diff: components/bookmarks/browser/bookmark_model.cc

Issue 1841653003: Drop |languages| from {Format,Elide}Url* and IDNToUnicode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix typo in elide_url.cc Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/bookmarks/browser/bookmark_model.h ('k') | components/bookmarks/browser/bookmark_utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/bookmarks/browser/bookmark_model.cc
diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmarks/browser/bookmark_model.cc
index 51d0f50df21a33f4cce48e86b74c1f7dbe01e3e5..3343af0be6d0d2c71302f66f7b1b9eaa095c6f01 100644
--- a/components/bookmarks/browser/bookmark_model.cc
+++ b/components/bookmarks/browser/bookmark_model.cc
@@ -147,7 +147,6 @@ void BookmarkModel::Shutdown() {
void BookmarkModel::Load(
PrefService* pref_service,
- const std::string& accept_languages,
const base::FilePath& profile_path,
const scoped_refptr<base::SequencedTaskRunner>& io_task_runner,
const scoped_refptr<base::SequencedTaskRunner>& ui_task_runner) {
@@ -163,7 +162,7 @@ void BookmarkModel::Load(
// Load the bookmarks. BookmarkStorage notifies us when done.
store_.reset(new BookmarkStorage(this, profile_path, io_task_runner.get()));
- store_->LoadBookmarks(CreateLoadDetails(accept_languages), ui_task_runner);
+ store_->LoadBookmarks(CreateLoadDetails(), ui_task_runner);
}
const BookmarkNode* BookmarkModel::GetParentForNewNodes() {
@@ -1090,8 +1089,7 @@ int64_t BookmarkModel::generate_next_node_id() {
return next_node_id_++;
}
-scoped_ptr<BookmarkLoadDetails> BookmarkModel::CreateLoadDetails(
- const std::string& accept_languages) {
+scoped_ptr<BookmarkLoadDetails> BookmarkModel::CreateLoadDetails() {
BookmarkPermanentNode* bb_node =
CreatePermanentNode(BookmarkNode::BOOKMARK_BAR);
BookmarkPermanentNode* other_node =
@@ -1103,7 +1101,7 @@ scoped_ptr<BookmarkLoadDetails> BookmarkModel::CreateLoadDetails(
other_node,
mobile_node,
client_->GetLoadExtraNodesCallback(),
- new BookmarkIndex(client_.get(), accept_languages),
+ new BookmarkIndex(client_.get()),
next_node_id_));
}
« no previous file with comments | « components/bookmarks/browser/bookmark_model.h ('k') | components/bookmarks/browser/bookmark_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698