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

Unified Diff: ui/base/clipboard/clipboard_util_win.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/clipboard/clipboard_unittest.cc ('k') | ui/base/clipboard/clipboard_util_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/clipboard/clipboard_util_win.h
diff --git a/ui/base/clipboard/clipboard_util_win.h b/ui/base/clipboard/clipboard_util_win.h
index f55853dd327a5a7c64d67fa84defbb34d0529bba..523897b8c8c99d32b78335076258045118edb522 100644
--- a/ui/base/clipboard/clipboard_util_win.h
+++ b/ui/base/clipboard/clipboard_util_win.h
@@ -32,24 +32,26 @@ class UI_EXPORT ClipboardUtil {
// Helper methods to extract information from an IDataObject. These methods
// return true if the requested data type is found in |data_object|.
static bool GetUrl(IDataObject* data_object,
- string16* url,
- string16* title,
+ base::string16* url,
+ base::string16* title,
bool convert_filenames);
static bool GetFilenames(IDataObject* data_object,
- std::vector<string16>* filenames);
- static bool GetPlainText(IDataObject* data_object, string16* plain_text);
+ std::vector<base::string16>* filenames);
+ static bool GetPlainText(IDataObject* data_object,
+ base::string16* plain_text);
static bool GetHtml(IDataObject* data_object,
- string16* text_html,
+ base::string16* text_html,
std::string* base_url);
static bool GetFileContents(IDataObject* data_object,
- string16* filename,
+ base::string16* filename,
std::string* file_contents);
// This represents custom MIME types a web page might set to transport its
// own types of data for drag and drop. It is sandboxed in its own CLIPFORMAT
// to avoid polluting the ::RegisterClipboardFormat() namespace with random
// strings from web content.
- static bool GetWebCustomData(IDataObject* data_object,
- std::map<string16, string16>* custom_data);
+ static bool GetWebCustomData(
+ IDataObject* data_object,
+ std::map<base::string16, base::string16>* custom_data);
// Helper method for converting between MS CF_HTML format and plain
// text/html.
« no previous file with comments | « ui/base/clipboard/clipboard_unittest.cc ('k') | ui/base/clipboard/clipboard_util_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698