Remove wstring from TableModel....

chrome/browser/ui/views/options/passwords_page_view.cc

 // Copyright (c) 2010 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/views/options/passwords_page_view.h"
 
 #include "app/l10n_util.h"
 #include "base/i18n/rtl.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 52 matching lines @@
 }
 
 PasswordsTableModel::~PasswordsTableModel() {
   CancelLoginsQuery();
 }
 
 int PasswordsTableModel::RowCount() {
   return static_cast<int>(saved_signons_.size());
 }
 
-std::wstring PasswordsTableModel::GetText(int row,
-                                          int col_id) {
+string16 PasswordsTableModel::GetText(int row,
+                                      int col_id) {
   switch (col_id) {
     case IDS_PASSWORDS_PAGE_VIEW_SITE_COLUMN: {  // Site.
       // Force URL to have LTR directionality.
       std::wstring url(saved_signons_[row]->display_url.display_url());
-      url = UTF16ToWide(base::i18n::GetDisplayStringInLTRDirectionality(
-          WideToUTF16(url)));
-      return url;
+      return base::i18n::GetDisplayStringInLTRDirectionality(
+          WideToUTF16(url));

[viettrungluu, 2010/12/29 23:41:17]

Should this be WideToUTF16Hack?

[Avi (use Gerrit), 2010/12/30 00:04:15]

Sure. In general the distinction between Hack and not hack is gray.

     }
     case IDS_PASSWORDS_PAGE_VIEW_USERNAME_COLUMN: {  // Username.
       std::wstring username = GetPasswordFormAt(row)->username_value;
       base::i18n::AdjustStringForLocaleDirection(&username);
-      return username;
+      return WideToUTF16Hack(username);
     }
     default:
       NOTREACHED() << "Invalid column.";
-      return std::wstring();
+      return string16();
   }
 }
 
 int PasswordsTableModel::CompareValues(int row1, int row2,
                                        int column_id) {
   if (column_id == IDS_PASSWORDS_PAGE_VIEW_SITE_COLUMN) {
     return saved_signons_[row1]->display_url.Compare(
         saved_signons_[row2]->display_url, GetCollator());
   }
   return TableModel::CompareValues(row1, row2, column_id);
@@ skipping 257 matching lines @@
     bool show = allow_show_passwords_.GetValue();
     if (!show)
       HidePassword();
     show_button_.SetVisible(show);
     password_label_.SetVisible(show);
     // Update the layout (it may depend on the button size).
     show_button_.InvalidateLayout();
     Layout();
   }
 }