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

Unified Diff: content/browser/download/drag_download_util.cc

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
« no previous file with comments | « content/browser/download/drag_download_util.h ('k') | content/browser/download/save_package.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/download/drag_download_util.cc
diff --git a/content/browser/download/drag_download_util.cc b/content/browser/download/drag_download_util.cc
index 41bff06dd27c4a78930e7a2397406de7753a3ae8..0850c3ba0816146d8f15746e94a9400613a904d0 100644
--- a/content/browser/download/drag_download_util.cc
+++ b/content/browser/download/drag_download_util.cc
@@ -23,18 +23,18 @@ using net::FileStream;
namespace content {
-bool ParseDownloadMetadata(const string16& metadata,
- string16* mime_type,
+bool ParseDownloadMetadata(const base::string16& metadata,
+ base::string16* mime_type,
base::FilePath* file_name,
GURL* url) {
const char16 separator = L':';
size_t mime_type_end_pos = metadata.find(separator);
- if (mime_type_end_pos == string16::npos)
+ if (mime_type_end_pos == base::string16::npos)
return false;
size_t file_name_end_pos = metadata.find(separator, mime_type_end_pos + 1);
- if (file_name_end_pos == string16::npos)
+ if (file_name_end_pos == base::string16::npos)
return false;
GURL parsed_url = GURL(metadata.substr(file_name_end_pos + 1));
@@ -44,7 +44,7 @@ bool ParseDownloadMetadata(const string16& metadata,
if (mime_type)
*mime_type = metadata.substr(0, mime_type_end_pos);
if (file_name) {
- string16 file_name_str = metadata.substr(
+ base::string16 file_name_str = metadata.substr(
mime_type_end_pos + 1, file_name_end_pos - mime_type_end_pos - 1);
#if defined(OS_WIN)
*file_name = base::FilePath(file_name_str);
@@ -70,7 +70,7 @@ FileStream* CreateFileStreamForDrop(base::FilePath* file_path,
new_file_path = *file_path;
} else {
#if defined(OS_WIN)
- string16 suffix = ASCIIToUTF16("-") + base::IntToString16(seq);
+ base::string16 suffix = ASCIIToUTF16("-") + base::IntToString16(seq);
#else
std::string suffix = std::string("-") + base::IntToString(seq);
#endif
« no previous file with comments | « content/browser/download/drag_download_util.h ('k') | content/browser/download/save_package.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698