Index: chrome/browser/download/download_item_model.h |
diff --git a/chrome/browser/download/download_item_model.h b/chrome/browser/download/download_item_model.h |
index 05a1023f5c32b653a665c9e4e71539f078a632e1..041981388f312cf4ddf69ca6f9fe0f32960573dd 100644 |
--- a/chrome/browser/download/download_item_model.h |
+++ b/chrome/browser/download/download_item_model.h |
@@ -37,14 +37,14 @@ class DownloadItemModel { |
// Returns a long descriptive string for a download that's in the INTERRUPTED |
// state. For other downloads, the returned string will be empty. |
- string16 GetInterruptReasonText() const; |
+ base::string16 GetInterruptReasonText() const; |
// Returns a short one-line status string for the download. |
- string16 GetStatusText() const; |
+ base::string16 GetStatusText() const; |
// Returns the localized status text for an in-progress download. This |
// is the progress status used in the WebUI interface. |
- string16 GetTabProgressStatusText() const; |
+ base::string16 GetTabProgressStatusText() const; |
// Returns a string suitable for use as a tooltip. For a regular download, the |
// tooltip is the filename. For an interrupted download, the string states the |
@@ -55,17 +55,17 @@ class DownloadItemModel { |
// |font_list| and |max_width| are used to elide the filename and/or interrupt |
// reason as necessary to keep the width of the tooltip text under |
// |max_width|. The tooltip will be at most 2 lines. |
- string16 GetTooltipText(const gfx::FontList& font_list, int max_width) const; |
+ base::string16 GetTooltipText(const gfx::FontList& font_list, int max_width) const; |
// Get the warning text to display for a dangerous download. The |base_width| |
// is the maximum width of an embedded filename (if there is one). The metrics |
// for the filename will be based on |font_list|. Should only be called if |
// IsDangerous() is true. |
- string16 GetWarningText(const gfx::FontList& font_list, int base_width) const; |
+ base::string16 GetWarningText(const gfx::FontList& font_list, int base_width) const; |
// Get the caption text for a button for confirming a dangerous download |
// warning. |
- string16 GetWarningConfirmButtonText() const; |
+ base::string16 GetWarningConfirmButtonText() const; |
// Get the number of bytes that has completed so far. Virtual for testing. |
int64 GetCompletedBytes() const; |
@@ -146,10 +146,10 @@ class DownloadItemModel { |
// MB" where the numerator is the transferred size and the denominator is the |
// total size. If the total isn't known, returns the transferred size as a |
// string (e.g.: "100 MB"). |
- string16 GetProgressSizesString() const; |
+ base::string16 GetProgressSizesString() const; |
// Returns a string indicating the status of an in-progress download. |
- string16 GetInProgressStatusString() const; |
+ base::string16 GetInProgressStatusString() const; |
// The DownloadItem that this model represents. Note that DownloadItemModel |
// itself shouldn't maintain any state since there can be more than one |