diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-30 05:31:40 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-30 05:31:40 +0000 |
| commit | 440b37b2c3a29be151a7262d9188d5e8151176fb (patch) | |
| tree | b2cc9283d1efd597472619dcfd016a4a0f0e32ff /chrome/browser/importer | |
| parent | 6cd3bd20cd448bc1bca33748395bf4381dfb7fc6 (diff) | |
| download | chromium_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/importer')
| -rw-r--r-- | chrome/browser/importer/ie_importer.cc | 1 | ||||
| -rw-r--r-- | chrome/browser/importer/profile_writer.cc | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/importer/ie_importer.cc b/chrome/browser/importer/ie_importer.cc index 5f0adca..57b095a 100644 --- a/chrome/browser/importer/ie_importer.cc +++ b/chrome/browser/importer/ie_importer.cc @@ -24,6 +24,7 @@ #include "base/string_util.h" #include "base/time.h" #include "base/values.h" +#include "base/utf_string_conversions.h" #include "base/win_util.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/importer/importer_bridge.h" diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer/profile_writer.cc index 0f89283..5833f2d 100644 --- a/chrome/browser/importer/profile_writer.cc +++ b/chrome/browser/importer/profile_writer.cc @@ -101,7 +101,7 @@ void ProfileWriter::AddBookmarkEntry( const BookmarkNode* node = parent->GetChild(index); if ((node->type() == BookmarkNode::BOOKMARK_BAR || node->type() == BookmarkNode::FOLDER) && - node->GetTitleAsString16() == WideToUTF16Hack(folder_name)) { + node->GetTitle() == WideToUTF16Hack(folder_name)) { child = node; break; } @@ -286,7 +286,7 @@ std::wstring ProfileWriter::GenerateUniqueFolderName( for (int i = 0, child_count = other->GetChildCount(); i < child_count; ++i) { const BookmarkNode* node = other->GetChild(i); if (node->is_folder()) - other_folder_names.insert(UTF16ToWideHack(node->GetTitleAsString16())); + other_folder_names.insert(UTF16ToWideHack(node->GetTitle())); } if (other_folder_names.find(folder_name) == other_folder_names.end()) @@ -314,7 +314,7 @@ bool ProfileWriter::DoesBookmarkExist( for (size_t i = 0; i < nodes_with_same_url.size(); ++i) { const BookmarkNode* node = nodes_with_same_url[i]; - if (WideToUTF16Hack(entry.title) != node->GetTitleAsString16()) + if (WideToUTF16Hack(entry.title) != node->GetTitle()) continue; // Does the path match? |