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

Unified Diff: webkit/tools/test_shell/simple_clipboard_impl.h

Issue 13219005: Replace string16 with base::string16 in src/webkit (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 months 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
Index: webkit/tools/test_shell/simple_clipboard_impl.h
diff --git a/webkit/tools/test_shell/simple_clipboard_impl.h b/webkit/tools/test_shell/simple_clipboard_impl.h
index 98d8d5b3c15802a04b770bf57b95bd4124b7dbb3..9a8b4385f55bb89281e852b182d5282838ed44e1 100644
--- a/webkit/tools/test_shell/simple_clipboard_impl.h
+++ b/webkit/tools/test_shell/simple_clipboard_impl.h
@@ -19,13 +19,13 @@ class SimpleClipboardClient : public webkit_glue::ClipboardClient {
ui::Clipboard::Buffer buffer) OVERRIDE;
virtual void Clear(ui::Clipboard::Buffer buffer) OVERRIDE;
virtual void ReadAvailableTypes(ui::Clipboard::Buffer buffer,
- std::vector<string16>* types,
+ std::vector<base::string16>* types,
bool* contains_filenames) OVERRIDE;
virtual void ReadText(ui::Clipboard::Buffer buffer,
- string16* result) OVERRIDE;
+ base::string16* result) OVERRIDE;
virtual void ReadAsciiText(ui::Clipboard::Buffer buffer,
std::string* result) OVERRIDE;
- virtual void ReadHTML(ui::Clipboard::Buffer buffer, string16* markup,
+ virtual void ReadHTML(ui::Clipboard::Buffer buffer, base::string16* markup,
GURL* url, uint32* fragment_start,
uint32* fragment_end) OVERRIDE;
virtual void ReadRTF(ui::Clipboard::Buffer buffer,
@@ -33,8 +33,8 @@ class SimpleClipboardClient : public webkit_glue::ClipboardClient {
virtual void ReadImage(ui::Clipboard::Buffer buffer,
std::string* data) OVERRIDE;
virtual void ReadCustomData(ui::Clipboard::Buffer buffer,
- 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;

Powered by Google App Engine
This is Rietveld 408576698