Change std::wstring to string16 for views::Label and views::Link

chrome/browser/ui/views/download/download_item_view.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/download/download_item_view.h"
 
+#include <algorithm>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/file_path.h"
 #include "base/i18n/break_iterator.h"
 #include "base/i18n/rtl.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
@@ skipping 252 matching lines @@
         ui::ElideString(rootname,
                         kFileNameMaxLength - extension.length(),
                         &rootname);
         string16 filename = rootname + ASCIIToUTF16(".") + extension;
         filename = base::i18n::GetDisplayStringInLTRDirectionality(filename);
         dangerous_label =
             l10n_util::GetStringFUTF16(IDS_PROMPT_DANGEROUS_DOWNLOAD, filename);
       }
     }
 
-    dangerous_download_label_ = new views::Label(UTF16ToWide(dangerous_label));
+    dangerous_download_label_ = new views::Label(dangerous_label);
     dangerous_download_label_->SetMultiLine(true);
     dangerous_download_label_->SetHorizontalAlignment(
         views::Label::ALIGN_LEFT);
     AddChildView(dangerous_download_label_);
     SizeLabelToMinWidth();
   }
 
   UpdateAccessibleName();
   set_accessibility_focusable(true);
 
@@ skipping 737 matching lines @@
   return size;
 }
 
 // This method computes the minimum width of the label for displaying its text
 // on 2 lines.  It just breaks the string in 2 lines on the spaces and keeps the
 // configuration with minimum width.
 void DownloadItemView::SizeLabelToMinWidth() {
   if (dangerous_download_label_sized_)
     return;
 
-  string16 text = WideToUTF16(dangerous_download_label_->GetText());
+  string16 text = dangerous_download_label_->GetText();
   TrimWhitespace(text, TRIM_ALL, &text);
   DCHECK_EQ(string16::npos, text.find('\n'));
 
   // Make the label big so that GetPreferredSize() is not constrained by the
   // current width.
   dangerous_download_label_->SetBounds(0, 0, 1000, 1000);
 
   gfx::Size size;
   int min_width = -1;
   // Using BREAK_WORD can work in most cases, but it can also break
@@ skipping 10 matching lines @@
     if (pos >= text.length())
       break;
     // This can be a low surrogate codepoint, but u_isUWhiteSpace will
     // return false and inserting a new line after a surrogate pair
     // is perfectly ok.
     char16 line_end_char = text[pos - 1];
     if (u_isUWhiteSpace(line_end_char))
       current_text.replace(pos - 1, 1, 1, char16('\n'));
     else
       current_text.insert(pos, 1, char16('\n'));
-    dangerous_download_label_->SetText(UTF16ToWide(current_text));
+    dangerous_download_label_->SetText(current_text);
     size = dangerous_download_label_->GetPreferredSize();
 
     if (min_width == -1)
       min_width = size.width();
 
     // If the width is growing again, it means we passed the optimal width spot.
     if (size.width() > min_width) {
-      dangerous_download_label_->SetText(UTF16ToWide(prev_text));
+      dangerous_download_label_->SetText(prev_text);
       break;
     } else {
       min_width = size.width();
     }
 
     // Restore the string.
     prev_text = current_text;
     current_text = text;
   }
 
@@ skipping 13 matching lines @@
 
 bool DownloadItemView::InDropDownButtonXCoordinateRange(int x) {
   if (x > drop_down_x_left_ && x < drop_down_x_right_)
     return true;
   return false;
 }
 
 void DownloadItemView::UpdateAccessibleName() {
   string16 new_name;
   if (download_->safety_state() == DownloadItem::DANGEROUS) {
-    new_name = WideToUTF16Hack(dangerous_download_label_->GetText());
+    new_name = dangerous_download_label_->GetText();
   } else {
     new_name = status_text_ + char16(' ') +
         download_->GetFileNameToReportUser().LossyDisplayName();
   }
 
   // If the name has changed, notify assistive technology that the name
   // has changed so they can announce it immediately.
   if (new_name != accessible_name_) {
     accessible_name_ = new_name;
     if (GetWidget()) {
       GetWidget()->NotifyAccessibilityEvent(
           this, ui::AccessibilityTypes::EVENT_NAME_CHANGED, true);
     }
   }
 }