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

Unified Diff: ui/base/x/selection_utils.h

Issue 117983002: Prefix string16 with base:: in ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge 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 | « ui/base/win/shell.cc ('k') | ui/base/x/selection_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/x/selection_utils.h
diff --git a/ui/base/x/selection_utils.h b/ui/base/x/selection_utils.h
index 350f383e81c6cfebf8336364628df9929efafae9..97709380fa01159ff5909ed6a32b99579ec6eb9f 100644
--- a/ui/base/x/selection_utils.h
+++ b/ui/base/x/selection_utils.h
@@ -37,14 +37,14 @@ UI_EXPORT void GetAtomIntersection(const std::vector< ::Atom>& desired,
const std::vector< ::Atom>& offered,
std::vector< ::Atom>* output);
-// Takes the raw bytes of the string16 and copies them into |bytes|.
-UI_EXPORT void AddString16ToVector(const string16& str,
+// Takes the raw bytes of the base::string16 and copies them into |bytes|.
+UI_EXPORT void AddString16ToVector(const base::string16& str,
std::vector<unsigned char>* bytes);
UI_EXPORT std::string RefCountedMemoryToString(
const scoped_refptr<base::RefCountedMemory>& memory);
-UI_EXPORT string16 RefCountedMemoryToString16(
+UI_EXPORT base::string16 RefCountedMemoryToString16(
const scoped_refptr<base::RefCountedMemory>& memory);
///////////////////////////////////////////////////////////////////////////////
@@ -105,11 +105,11 @@ class UI_EXPORT SelectionData {
// If |type_| is the HTML type, returns the data as a string16. This detects
// guesses the character encoding of the source.
- string16 GetHtml() const;
+ base::string16 GetHtml() const;
// Assigns the raw data to the string.
void AssignTo(std::string* result) const;
- void AssignTo(string16* result) const;
+ void AssignTo(base::string16* result) const;
private:
::Atom type_;
« no previous file with comments | « ui/base/win/shell.cc ('k') | ui/base/x/selection_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698