diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-06 16:05:56 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-06 16:05:56 +0000 |
| commit | f0000972b6af1fd1f5efd34aab2400580d1a8679 (patch) | |
| tree | 794787930c5f22fb75f4af398322c803ca896189 | |
| parent | a9ee2c8e9de6f9f191a0444c11c116c8c878b5d2 (diff) | |
| download | chromium_src-f0000972b6af1fd1f5efd34aab2400580d1a8679.zip chromium_src-f0000972b6af1fd1f5efd34aab2400580d1a8679.tar.gz chromium_src-f0000972b6af1fd1f5efd34aab2400580d1a8679.tar.bz2 | |
views/bookmarks: Remove WideToUTF16 conversion when calling EditorNode ctor.
The conversion is not more necessary since GetTitle() already returns a
string16, and the conversion just works because on Windows string16 == wstring.
BUG=None
TEST=None
R=sky@chromium.org
Review URL: http://codereview.chromium.org/7250012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91568 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc index d576406..04056ba 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc @@ -455,11 +455,9 @@ void BookmarkEditorView::NewFolder() { BookmarkEditorView::EditorNode* BookmarkEditorView::AddNewFolder( EditorNode* parent) { - EditorNode* new_node = new EditorNode(); - new_node->set_title( - l10n_util::GetStringUTF16(IDS_BOOMARK_EDITOR_NEW_FOLDER_NAME)); - new_node->value = 0; - // new_node is now owned by parent. + EditorNode* new_node = new EditorNode( + l10n_util::GetStringUTF16(IDS_BOOMARK_EDITOR_NEW_FOLDER_NAME), 0); + // |new_node| is now owned by |parent|. tree_model_->Add(parent, new_node, parent->child_count()); return new_node; } @@ -480,7 +478,7 @@ void BookmarkEditorView::ExpandAndSelect() { } BookmarkEditorView::EditorNode* BookmarkEditorView::CreateRootNode() { - EditorNode* root_node = new EditorNode(std::wstring(), 0); + EditorNode* root_node = new EditorNode(string16(), 0); const BookmarkNode* bb_root_node = bb_model_->root_node(); CreateNodes(bb_root_node, root_node); DCHECK(root_node->child_count() >= 2 && root_node->child_count() <= 3); @@ -497,9 +495,8 @@ void BookmarkEditorView::CreateNodes(const BookmarkNode* bb_node, for (int i = 0; i < bb_node->child_count(); ++i) { const BookmarkNode* child_bb_node = bb_node->GetChild(i); if (child_bb_node->IsVisible() && child_bb_node->is_folder()) { - EditorNode* new_b_node = - new EditorNode(WideToUTF16(child_bb_node->GetTitle()), - child_bb_node->id()); + EditorNode* new_b_node = new EditorNode(child_bb_node->GetTitle(), + child_bb_node->id()); b_node->Add(new_b_node, b_node->child_count()); CreateNodes(child_bb_node, new_b_node); } |