Index: content/renderer/renderer_clipboard_client.h |
diff --git a/content/renderer/renderer_clipboard_client.h b/content/renderer/renderer_clipboard_client.h |
index 1635a2bfb1738201c07e18e823dfde49b4e539cd..96d05b2621a7c1f14714a27b02e667cb5442d2f7 100644 |
--- a/content/renderer/renderer_clipboard_client.h |
+++ b/content/renderer/renderer_clipboard_client.h |
@@ -22,22 +22,22 @@ class RendererClipboardClient : public ClipboardClient { |
ui::ClipboardType type) OVERRIDE; |
virtual void Clear(ui::ClipboardType type) OVERRIDE; |
virtual void ReadAvailableTypes(ui::ClipboardType type, |
- std::vector<string16>* types, |
+ std::vector<base::string16>* types, |
bool* contains_filenames) OVERRIDE; |
virtual void ReadText(ui::ClipboardType type, |
- string16* result) OVERRIDE; |
+ base::string16* result) OVERRIDE; |
virtual void ReadAsciiText(ui::ClipboardType type, |
std::string* result) OVERRIDE; |
virtual void ReadHTML(ui::ClipboardType type, |
- string16* markup, |
+ base::string16* markup, |
GURL* url, |
uint32* fragment_start, |
uint32* fragment_end) OVERRIDE; |
virtual void ReadRTF(ui::ClipboardType type, std::string* result) OVERRIDE; |
virtual void ReadImage(ui::ClipboardType type, std::string* data) OVERRIDE; |
virtual void ReadCustomData(ui::ClipboardType clipboard_type, |
- const string16& type, |
- string16* data) OVERRIDE; |
+ const base::string16& type, |
+ base::string16* data) OVERRIDE; |
virtual void ReadData(const ui::Clipboard::FormatType& format, |
std::string* data) OVERRIDE; |
virtual WriteContext* CreateWriteContext() OVERRIDE; |