summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/bookmark_editor_view.cc
diff options
context:
space:
mode:
authorviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-30 05:31:40 +0000
committerviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-30 05:31:40 +0000
commit440b37b2c3a29be151a7262d9188d5e8151176fb (patch)
treeb2cc9283d1efd597472619dcfd016a4a0f0e32ff /chrome/browser/views/bookmark_editor_view.cc
parent6cd3bd20cd448bc1bca33748395bf4381dfb7fc6 (diff)
downloadchromium_src-440b37b2c3a29be151a7262d9188d5e8151176fb.zip
chromium_src-440b37b2c3a29be151a7262d9188d5e8151176fb.tar.gz
chromium_src-440b37b2c3a29be151a7262d9188d5e8151176fb.tar.bz2
Remove the wstring TreeModelNode::GetTitle() and rename GetTitleAsString16() to GetTitle().
BUG=23581 TEST=builds and passes tests Review URL: http://codereview.chromium.org/3279005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57834 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/bookmark_editor_view.cc')
-rw-r--r--chrome/browser/views/bookmark_editor_view.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/views/bookmark_editor_view.cc b/chrome/browser/views/bookmark_editor_view.cc
index 9a0726e..9bf525c 100644
--- a/chrome/browser/views/bookmark_editor_view.cc
+++ b/chrome/browser/views/bookmark_editor_view.cc
@@ -489,7 +489,7 @@ void BookmarkEditorView::CreateNodes(const BookmarkNode* bb_node,
const BookmarkNode* child_bb_node = bb_node->GetChild(i);
if (child_bb_node->is_folder()) {
EditorNode* new_b_node =
- new EditorNode(WideToUTF16(child_bb_node->GetTitleAsString16()),
+ new EditorNode(WideToUTF16(child_bb_node->GetTitle()),
child_bb_node->id());
b_node->Add(b_node->GetChildCount(), new_b_node);
CreateNodes(child_bb_node, new_b_node);
@@ -561,7 +561,7 @@ void BookmarkEditorView::ApplyNameChangesAndCreateNewGroups(
if (child_b_node->value == 0) {
// New group.
child_bb_node = bb_model_->AddGroup(bb_node,
- bb_node->GetChildCount(), child_b_node->GetTitleAsString16());
+ bb_node->GetChildCount(), child_b_node->GetTitle());
} else {
// Existing node, reset the title (BBModel ignores changes if the title
// is the same).
@@ -573,7 +573,7 @@ void BookmarkEditorView::ApplyNameChangesAndCreateNewGroups(
}
}
DCHECK(child_bb_node);
- bb_model_->SetTitle(child_bb_node, child_b_node->GetTitleAsString16());
+ bb_model_->SetTitle(child_bb_node, child_b_node->GetTitle());
}
ApplyNameChangesAndCreateNewGroups(child_bb_node, child_b_node,
parent_b_node, parent_bb_node);