chrome/browser/sync/glue/typed_url_model_associator.cc - Issue 120983002: Update some uses of UTF conversions in chrome/browser to use the base:: namespace.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/sync/glue/typed_url_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

« no previous file with comments | « chrome/browser/sync/glue/typed_url_change_processor.cc ('k') | chrome/browser/sync/glue/typed_url_model_associator_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/glue/typed_url_model_associator.cc

diff --git a/chrome/browser/sync/glue/typed_url_model_associator.cc b/chrome/browser/sync/glue/typed_url_model_associator.cc

index a2c989aa9138a2d0870bfa6ee8b85a31c6689d05..3c427502543922614565d009ee63cdde1fb97c25 100644

--- a/chrome/browser/sync/glue/typed_url_model_associator.cc

+++ b/chrome/browser/sync/glue/typed_url_model_associator.cc

@@ -304,7 +304,7 @@ syncer::SyncError TypedUrlModelAssociator::DoAssociateModels() {

model_type());

}

- node.SetTitle(UTF8ToWide(tag));

+ node.SetTitle(base::UTF8ToWide(tag));

WriteToSyncNode(*ix, visits, &node);

}

@@ -573,7 +573,7 @@ TypedUrlModelAssociator::MergeResult TypedUrlModelAssociator::MergeUrls(

return DIFF_UPDATE_NODE;

// Convert these values only once.

- base::string16 node_title(UTF8ToUTF16(node.title()));

+ base::string16 node_title(base::UTF8ToUTF16(node.title()));

base::Time node_last_visit = base::Time::FromInternalValue(

node.visits(node.visits_size() - 1));

@@ -690,7 +690,7 @@ void TypedUrlModelAssociator::WriteToTypedUrlSpecifics(

visits.back().visit_time.ToInternalValue());

typed_url->set_url(url.url().spec());

- typed_url->set_title(UTF16ToUTF8(url.title()));

+ typed_url->set_title(base::UTF16ToUTF8(url.title()));

typed_url->set_hidden(url.hidden());

DCHECK(CheckVisitOrdering(visits));

@@ -821,7 +821,7 @@ void TypedUrlModelAssociator::UpdateURLRowFromTypedUrlSpecifics(

const sync_pb::TypedUrlSpecifics& typed_url, history::URLRow* new_url) {

DCHECK_GT(typed_url.visits_size(), 0);

CHECK_EQ(typed_url.visit_transitions_size(), typed_url.visits_size());

- new_url->set_title(UTF8ToUTF16(typed_url.title()));

+ new_url->set_title(base::UTF8ToUTF16(typed_url.title()));

new_url->set_hidden(typed_url.hidden());

// Only provide the initial value for the last_visit field - after that, let

// the history code update the last_visit field on its own.