| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/bookmarks/bookmark_model.h" | 5 #include "chrome/browser/bookmarks/bookmark_model.h" |
| 6 | 6 |
| 7 #include "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
| 8 #include "app/l10n_util_collator.h" | 8 #include "app/l10n_util_collator.h" |
| 9 #include "base/callback.h" | 9 #include "base/callback.h" |
| 10 #include "base/scoped_vector.h" | 10 #include "base/scoped_vector.h" |
| (...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 234 const SkBitmap& BookmarkModel::GetFavIcon(const BookmarkNode* node) { | 234 const SkBitmap& BookmarkModel::GetFavIcon(const BookmarkNode* node) { |
| 235 DCHECK(node); | 235 DCHECK(node); |
| 236 if (!node->is_favicon_loaded()) { | 236 if (!node->is_favicon_loaded()) { |
| 237 BookmarkNode* mutable_node = AsMutable(node); | 237 BookmarkNode* mutable_node = AsMutable(node); |
| 238 mutable_node->set_favicon_loaded(true); | 238 mutable_node->set_favicon_loaded(true); |
| 239 LoadFavIcon(mutable_node); | 239 LoadFavIcon(mutable_node); |
| 240 } | 240 } |
| 241 return node->favicon(); | 241 return node->favicon(); |
| 242 } | 242 } |
| 243 | 243 |
| 244 #if !defined(WCHAR_T_IS_UTF16) | |
| 245 void BookmarkModel::SetTitle(const BookmarkNode* node, | |
| 246 const std::wstring& title) { | |
| 247 SetTitle(node, WideToUTF16(title)); | |
| 248 } | |
| 249 #endif | |
| 250 void BookmarkModel::SetTitle(const BookmarkNode* node, const string16& title) { | 244 void BookmarkModel::SetTitle(const BookmarkNode* node, const string16& title) { |
| 251 if (!node) { | 245 if (!node) { |
| 252 NOTREACHED(); | 246 NOTREACHED(); |
| 253 return; | 247 return; |
| 254 } | 248 } |
| 255 if (node->GetTitleAsString16() == title) | 249 if (node->GetTitleAsString16() == title) |
| 256 return; | 250 return; |
| 257 | 251 |
| 258 if (node == bookmark_bar_node_ || node == other_node_) { | 252 if (node == bookmark_bar_node_ || node == other_node_) { |
| 259 NOTREACHED(); | 253 NOTREACHED(); |
| (...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 808 void BookmarkModel::SetFileChanged() { | 802 void BookmarkModel::SetFileChanged() { |
| 809 file_changed_ = true; | 803 file_changed_ = true; |
| 810 } | 804 } |
| 811 | 805 |
| 812 BookmarkLoadDetails* BookmarkModel::CreateLoadDetails() { | 806 BookmarkLoadDetails* BookmarkModel::CreateLoadDetails() { |
| 813 BookmarkNode* bb_node = CreateBookmarkNode(); | 807 BookmarkNode* bb_node = CreateBookmarkNode(); |
| 814 BookmarkNode* other_folder_node = CreateOtherBookmarksNode(); | 808 BookmarkNode* other_folder_node = CreateOtherBookmarksNode(); |
| 815 return new BookmarkLoadDetails( | 809 return new BookmarkLoadDetails( |
| 816 bb_node, other_folder_node, new BookmarkIndex(profile()), next_node_id_); | 810 bb_node, other_folder_node, new BookmarkIndex(profile()), next_node_id_); |
| 817 } | 811 } |
| OLD | NEW |