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

Unified Diff: content/browser/renderer_host/clipboard_message_filter.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
Index: content/browser/renderer_host/clipboard_message_filter.h
diff --git a/content/browser/renderer_host/clipboard_message_filter.h b/content/browser/renderer_host/clipboard_message_filter.h
index 3ae7d1b5c1f94e5862dca9842abd4f9262f659af..dd2784be531bc5534eb0982c849e84b6d88137b7 100644
--- a/content/browser/renderer_host/clipboard_message_filter.h
+++ b/content/browser/renderer_host/clipboard_message_filter.h
@@ -39,12 +39,12 @@ class ClipboardMessageFilter : public BrowserMessageFilter {
bool* result);
void OnClear(ui::ClipboardType type);
void OnReadAvailableTypes(ui::ClipboardType type,
- std::vector<string16>* types,
+ std::vector<base::string16>* types,
bool* contains_filenames);
- void OnReadText(ui::ClipboardType type, string16* result);
+ void OnReadText(ui::ClipboardType type, base::string16* result);
void OnReadAsciiText(ui::ClipboardType type, std::string* result);
void OnReadHTML(ui::ClipboardType type,
- string16* markup,
+ base::string16* markup,
GURL* url,
uint32* fragment_start,
uint32* fragment_end);
@@ -52,13 +52,13 @@ class ClipboardMessageFilter : public BrowserMessageFilter {
void OnReadImage(ui::ClipboardType type, IPC::Message* reply_msg);
void OnReadImageReply(const SkBitmap& bitmap, IPC::Message* reply_msg);
void OnReadCustomData(ui::ClipboardType clipboard_type,
- const string16& type,
- string16* result);
+ const base::string16& type,
+ base::string16* result);
void OnReadData(const ui::Clipboard::FormatType& format,
std::string* data);
#if defined(OS_MACOSX)
- void OnFindPboardWriteString(const string16& text);
+ void OnFindPboardWriteString(const base::string16& text);
#endif
// We have our own clipboard because we want to access the clipboard on the
« no previous file with comments | « content/browser/ppapi_plugin_process_host.cc ('k') | content/browser/renderer_host/clipboard_message_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698