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

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

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/java_bridge_messages.h ('k') | content/common/mac/attributed_string_coder.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/mac/attributed_string_coder.h
diff --git a/content/common/mac/attributed_string_coder.h b/content/common/mac/attributed_string_coder.h
index 629beedff4ead5360ad03393435f8eb9c6d12fd9..35b3bf54a55403009bc2ff18ebc894235be96acf 100644
--- a/content/common/mac/attributed_string_coder.h
+++ b/content/common/mac/attributed_string_coder.h
@@ -62,12 +62,12 @@ class CONTENT_EXPORT AttributedStringCoder {
// which can be serialized over IPC.
class EncodedString {
public:
- explicit EncodedString(string16 string);
+ explicit EncodedString(base::string16 string);
EncodedString();
~EncodedString();
// Accessors:
- string16 string() const { return string_; }
+ base::string16 string() const { return string_; }
const std::vector<FontAttribute>& attributes() const {
return attributes_;
}
@@ -75,7 +75,7 @@ class CONTENT_EXPORT AttributedStringCoder {
private:
// The plain-text string.
- string16 string_;
+ base::string16 string_;
// The set of attributes that style |string_|.
std::vector<FontAttribute> attributes_;
};
« no previous file with comments | « content/common/java_bridge_messages.h ('k') | content/common/mac/attributed_string_coder.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698