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

Side by Side Diff: chrome/browser/bookmarks/bookmark_model.cc

Issue 7744055: bookmarks: Fix an obvious typo in IDS_BOOMARK_*. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 3 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 <algorithm> 7 #include <algorithm>
8 #include <functional> 8 #include <functional>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 704 matching lines...) Expand 10 before | Expand all | Expand 10 after
715 (allow_end && index == parent->child_count())))); 715 (allow_end && index == parent->child_count()))));
716 } 716 }
717 717
718 BookmarkNode* BookmarkModel::CreatePermanentNode(BookmarkNode::Type type) { 718 BookmarkNode* BookmarkModel::CreatePermanentNode(BookmarkNode::Type type) {
719 DCHECK(type == BookmarkNode::BOOKMARK_BAR || 719 DCHECK(type == BookmarkNode::BOOKMARK_BAR ||
720 type == BookmarkNode::OTHER_NODE || 720 type == BookmarkNode::OTHER_NODE ||
721 type == BookmarkNode::SYNCED); 721 type == BookmarkNode::SYNCED);
722 BookmarkNode* node = new BookmarkNode(generate_next_node_id(), GURL()); 722 BookmarkNode* node = new BookmarkNode(generate_next_node_id(), GURL());
723 node->set_type(type); 723 node->set_type(type);
724 if (type == BookmarkNode::BOOKMARK_BAR) { 724 if (type == BookmarkNode::BOOKMARK_BAR) {
725 node->set_title(l10n_util::GetStringUTF16(IDS_BOOMARK_BAR_FOLDER_NAME)); 725 node->set_title(l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_FOLDER_NAME));
726 } else if (type == BookmarkNode::OTHER_NODE) { 726 } else if (type == BookmarkNode::OTHER_NODE) {
727 node->set_title( 727 node->set_title(
728 l10n_util::GetStringUTF16(IDS_BOOMARK_BAR_OTHER_FOLDER_NAME)); 728 l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_OTHER_FOLDER_NAME));
729 } else { 729 } else {
730 node->set_title( 730 node->set_title(
731 l10n_util::GetStringUTF16(IDS_BOOMARK_BAR_SYNCED_FOLDER_NAME)); 731 l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_SYNCED_FOLDER_NAME));
732 } 732 }
733 return node; 733 return node;
734 } 734 }
735 735
736 void BookmarkModel::OnFaviconDataAvailable( 736 void BookmarkModel::OnFaviconDataAvailable(
737 FaviconService::Handle handle, 737 FaviconService::Handle handle,
738 history::FaviconData favicon) { 738 history::FaviconData favicon) {
739 SkBitmap favicon_bitmap; 739 SkBitmap favicon_bitmap;
740 BookmarkNode* node = 740 BookmarkNode* node =
741 load_consumer_.GetClientData( 741 load_consumer_.GetClientData(
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
827 file_changed_ = true; 827 file_changed_ = true;
828 } 828 }
829 829
830 BookmarkLoadDetails* BookmarkModel::CreateLoadDetails() { 830 BookmarkLoadDetails* BookmarkModel::CreateLoadDetails() {
831 BookmarkNode* bb_node = CreatePermanentNode(BookmarkNode::BOOKMARK_BAR); 831 BookmarkNode* bb_node = CreatePermanentNode(BookmarkNode::BOOKMARK_BAR);
832 BookmarkNode* other_node = CreatePermanentNode(BookmarkNode::OTHER_NODE); 832 BookmarkNode* other_node = CreatePermanentNode(BookmarkNode::OTHER_NODE);
833 BookmarkNode* synced_node = CreatePermanentNode(BookmarkNode::SYNCED); 833 BookmarkNode* synced_node = CreatePermanentNode(BookmarkNode::SYNCED);
834 return new BookmarkLoadDetails(bb_node, other_node, synced_node, 834 return new BookmarkLoadDetails(bb_node, other_node, synced_node,
835 new BookmarkIndex(profile_), next_node_id_); 835 new BookmarkIndex(profile_), next_node_id_);
836 } 836 }
OLDNEW
« no previous file with comments | « chrome/browser/bookmarks/bookmark_html_writer_unittest.cc ('k') | chrome/browser/bookmarks/bookmark_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698