| Index: ui/base/clipboard/clipboard_mac.mm
|
| diff --git a/ui/base/clipboard/clipboard_mac.mm b/ui/base/clipboard/clipboard_mac.mm
|
| index 8aee1d3bbfaeff1ea70d0cd01c84a94005d2da44..a774db0335ead13666c82cc4e22d1a8569f43e3b 100644
|
| --- a/ui/base/clipboard/clipboard_mac.mm
|
| +++ b/ui/base/clipboard/clipboard_mac.mm
|
| @@ -223,7 +223,7 @@ void Clipboard::Clear(ClipboardType type) {
|
| }
|
|
|
| void Clipboard::ReadAvailableTypes(ClipboardType type,
|
| - std::vector<string16>* types,
|
| + std::vector<base::string16>* types,
|
| bool* contains_filenames) const {
|
| DCHECK(CalledOnValidThread());
|
| types->clear();
|
| @@ -245,7 +245,7 @@ void Clipboard::ReadAvailableTypes(ClipboardType type,
|
| }
|
| }
|
|
|
| -void Clipboard::ReadText(ClipboardType type, string16* result) const {
|
| +void Clipboard::ReadText(ClipboardType type, base::string16* result) const {
|
| DCHECK(CalledOnValidThread());
|
| DCHECK_EQ(type, CLIPBOARD_TYPE_COPY_PASTE);
|
| NSPasteboard* pb = GetPasteboard();
|
| @@ -269,7 +269,7 @@ void Clipboard::ReadAsciiText(ClipboardType type, std::string* result) const {
|
| }
|
|
|
| void Clipboard::ReadHTML(ClipboardType type,
|
| - string16* markup,
|
| + base::string16* markup,
|
| std::string* src_url,
|
| uint32* fragment_start,
|
| uint32* fragment_end) const {
|
| @@ -327,8 +327,8 @@ SkBitmap Clipboard::ReadImage(ClipboardType type) const {
|
| }
|
|
|
| void Clipboard::ReadCustomData(ClipboardType clipboard_type,
|
| - const string16& type,
|
| - string16* result) const {
|
| + const base::string16& type,
|
| + base::string16* result) const {
|
| DCHECK(CalledOnValidThread());
|
| DCHECK_EQ(clipboard_type, CLIPBOARD_TYPE_COPY_PASTE);
|
|
|
| @@ -340,7 +340,7 @@ void Clipboard::ReadCustomData(ClipboardType clipboard_type,
|
| }
|
| }
|
|
|
| -void Clipboard::ReadBookmark(string16* title, std::string* url) const {
|
| +void Clipboard::ReadBookmark(base::string16* title, std::string* url) const {
|
| DCHECK(CalledOnValidThread());
|
| NSPasteboard* pb = GetPasteboard();
|
|
|
|
|