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

Unified Diff: chrome/browser/sync/glue/bookmark_model_associator.cc

Issue 120983002: Update some uses of UTF conversions in chrome/browser to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/glue/bookmark_model_associator.cc
diff --git a/chrome/browser/sync/glue/bookmark_model_associator.cc b/chrome/browser/sync/glue/bookmark_model_associator.cc
index a08669ff147be201a783ddc8e21f3f0da7252e6e..5e6a3c5ca8d4fc1eded9ddbf719017d6bb2c30fd 100644
--- a/chrome/browser/sync/glue/bookmark_model_associator.cc
+++ b/chrome/browser/sync/glue/bookmark_model_associator.cc
@@ -131,7 +131,7 @@ const BookmarkNode* BookmarkNodeFinder::FindBookmarkNode(
const GURL& url, const std::string& title, bool is_folder) {
// Create a bookmark node from the given bookmark attributes.
BookmarkNode temp_node(url);
- temp_node.SetTitle(UTF8ToUTF16(title));
+ temp_node.SetTitle(base::UTF8ToUTF16(title));
if (is_folder)
temp_node.set_type(BookmarkNode::FOLDER);
else
@@ -326,7 +326,7 @@ bool BookmarkModelAssociator::SyncModelHasUserCreatedNodes(bool* has_nodes) {
bool BookmarkModelAssociator::NodesMatch(
const BookmarkNode* bookmark,
const syncer::BaseNode* sync_node) const {
- if (bookmark->GetTitle() != UTF8ToUTF16(sync_node->GetTitle()))
+ if (bookmark->GetTitle() != base::UTF8ToUTF16(sync_node->GetTitle()))
return false;
if (bookmark->is_folder() != sync_node->GetIsFolder())
return false;
« no previous file with comments | « chrome/browser/sync/glue/bookmark_change_processor.cc ('k') | chrome/browser/sync/glue/generic_change_processor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698