summaryrefslogtreecommitdiffstats
path: root/chrome/browser/bookmarks
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/bookmarks')
-rw-r--r--chrome/browser/bookmarks/bookmark_index_unittest.cc2
-rw-r--r--chrome/browser/bookmarks/bookmark_model.cc6
-rw-r--r--chrome/browser/bookmarks/bookmark_model.h4
3 files changed, 1 insertions, 11 deletions
diff --git a/chrome/browser/bookmarks/bookmark_index_unittest.cc b/chrome/browser/bookmarks/bookmark_index_unittest.cc
index 3b0b33a..79b4710 100644
--- a/chrome/browser/bookmarks/bookmark_index_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_index_unittest.cc
@@ -191,7 +191,7 @@ TEST_F(BookmarkIndexTest, ChangeTitle) {
// Remove the node and make sure we don't get back any results.
const wchar_t* expected[] = { L"blah" };
- model_->SetTitle(model_->other_node()->GetChild(0), L"blah");
+ model_->SetTitle(model_->other_node()->GetChild(0), ASCIIToUTF16("blah"));
ExpectMatches(L"BlAh", expected, ARRAYSIZE_UNSAFE(expected));
}
diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc
index 9a4a70a..79892b1 100644
--- a/chrome/browser/bookmarks/bookmark_model.cc
+++ b/chrome/browser/bookmarks/bookmark_model.cc
@@ -241,12 +241,6 @@ const SkBitmap& BookmarkModel::GetFavIcon(const BookmarkNode* node) {
return node->favicon();
}
-#if !defined(WCHAR_T_IS_UTF16)
-void BookmarkModel::SetTitle(const BookmarkNode* node,
- const std::wstring& title) {
- SetTitle(node, WideToUTF16(title));
-}
-#endif
void BookmarkModel::SetTitle(const BookmarkNode* node, const string16& title) {
if (!node) {
NOTREACHED();
diff --git a/chrome/browser/bookmarks/bookmark_model.h b/chrome/browser/bookmarks/bookmark_model.h
index 8fcfb83..988ad7d 100644
--- a/chrome/browser/bookmarks/bookmark_model.h
+++ b/chrome/browser/bookmarks/bookmark_model.h
@@ -230,11 +230,7 @@ class BookmarkModel : public NotificationObserver, public BookmarkService {
// loaded it is loaded and the observer of the model notified when done.
const SkBitmap& GetFavIcon(const BookmarkNode* node);
- // TODO(munjal): Remove wstring overload once all code is moved to string16.
// Sets the title of the specified node.
-#if !defined(WCHAR_T_IS_UTF16)
- void SetTitle(const BookmarkNode* node, const std::wstring& title);
-#endif
void SetTitle(const BookmarkNode* node, const string16& title);
// Sets the URL of the specified bookmark node.