Remove wstring from TableModel....

chrome/browser/dom_ui/options/add_startup_page_handler.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/dom_ui/options/add_startup_page_handler.h"
 
 #include "app/l10n_util.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
@@ skipping 57 matching lines @@
 
   scoped_ptr<Value> url_value(Value::CreateStringValue(url_string));
   dom_ui_->CallJavascriptFunction(L"AddStartupPageOverlay.setInputFieldValue",
                                   *url_value.get());
 }
 
 void AddStartupPageHandler::OnModelChanged() {
   ListValue pages;
   for (int i = 0; i < url_table_model_->RowCount(); ++i) {
     DictionaryValue* dict = new DictionaryValue();
-    dict->SetString("title", WideToUTF16Hack(url_table_model_->GetText(
-        i, IDS_ASI_PAGE_COLUMN)));
-    dict->SetString("displayURL", WideToUTF16Hack(url_table_model_->GetText(
-        i, IDS_ASI_URL_COLUMN)));
+    dict->SetString("title", url_table_model_->GetText(i, IDS_ASI_PAGE_COLUMN));
+    dict->SetString("displayURL", url_table_model_->GetText(

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

Micro-nit: I think this would look nicer if you broke the line after
|"displayURL",| and lined things up on the following line?

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

Done.

+        i, IDS_ASI_URL_COLUMN));
     dict->SetString("url", url_table_model_->GetURL(i).spec());
     pages.Append(dict);
   }
 
   dom_ui_->CallJavascriptFunction(L"AddStartupPageOverlay.updateRecentPageList",
                                   pages);
 }
 
 void AddStartupPageHandler::OnItemsChanged(int start, int length) {
   OnModelChanged();
 }
 
 void AddStartupPageHandler::OnItemsAdded(int start, int length) {
   OnModelChanged();
 }
 
 void AddStartupPageHandler::OnItemsRemoved(int start, int length) {
   OnModelChanged();
 }