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

Unified Diff: content/common/mac/attributed_string_coder.mm

Issue 102593002: Convert string16 to base::string16 in content. (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 | « content/common/mac/attributed_string_coder.h ('k') | content/common/mac/font_descriptor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/mac/attributed_string_coder.mm
diff --git a/content/common/mac/attributed_string_coder.mm b/content/common/mac/attributed_string_coder.mm
index ba6eca535c19cf956acbc42792d6fdf89e29bf5e..f14103bde0f587e2dfed3258e586ef53def52171 100644
--- a/content/common/mac/attributed_string_coder.mm
+++ b/content/common/mac/attributed_string_coder.mm
@@ -65,7 +65,7 @@ NSAttributedString* AttributedStringCoder::Decode(
// Data Types //////////////////////////////////////////////////////////////////
-AttributedStringCoder::EncodedString::EncodedString(string16 string)
+AttributedStringCoder::EncodedString::EncodedString(base::string16 string)
: string_(string) {
}
@@ -129,7 +129,7 @@ bool ParamTraits<AttributedStringCoder::EncodedString>::Read(
const Message* m, PickleIterator* iter, param_type* p) {
bool success = true;
- string16 result;
+ base::string16 result;
success &= ReadParam(m, iter, &result);
*p = AttributedStringCoder::EncodedString(result);
« no previous file with comments | « content/common/mac/attributed_string_coder.h ('k') | content/common/mac/font_descriptor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698