diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-30 00:50:04 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-30 00:50:04 +0000 |
| commit | bdaab67c485eee51a098c7b34544c5d18bf725af (patch) | |
| tree | 31e0c087b57c538ef91b6598040f2b7f2293505d /chrome/browser/dom_ui | |
| parent | fbc7678b2f73707962861c99eb4c809604ddd611 (diff) | |
| download | chromium_src-bdaab67c485eee51a098c7b34544c5d18bf725af.zip chromium_src-bdaab67c485eee51a098c7b34544c5d18bf725af.tar.gz chromium_src-bdaab67c485eee51a098c7b34544c5d18bf725af.tar.bz2 | |
Remove wstring from TableModel.
BUG=23581
TEST=no visible changes; all tests pass
Review URL: http://codereview.chromium.org/6044007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70290 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/dom_ui')
3 files changed, 11 insertions, 13 deletions
diff --git a/chrome/browser/dom_ui/options/add_startup_page_handler.cc b/chrome/browser/dom_ui/options/add_startup_page_handler.cc index e76da33..33b2326 100644 --- a/chrome/browser/dom_ui/options/add_startup_page_handler.cc +++ b/chrome/browser/dom_ui/options/add_startup_page_handler.cc @@ -75,10 +75,9 @@ 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(i, IDS_ASI_URL_COLUMN)); dict->SetString("url", url_table_model_->GetURL(i).spec()); pages.Append(dict); } diff --git a/chrome/browser/dom_ui/options/browser_options_handler.cc b/chrome/browser/dom_ui/options/browser_options_handler.cc index 863b461..6d9a9620 100644 --- a/chrome/browser/dom_ui/options/browser_options_handler.cc +++ b/chrome/browser/dom_ui/options/browser_options_handler.cc @@ -281,11 +281,10 @@ void BrowserOptionsHandler::OnModelChanged() { std::vector<GURL> urls = startup_custom_pages_table_model_->GetURLs(); for (int i = 0; i < page_count; ++i) { DictionaryValue* entry = new DictionaryValue(); - entry->SetString("title", WideToUTF16Hack( - startup_custom_pages_table_model_->GetText(i, 0))); + entry->SetString("title", startup_custom_pages_table_model_->GetText(i, 0)); entry->SetString("url", urls[i].spec()); - entry->SetString("tooltip", WideToUTF16Hack( - startup_custom_pages_table_model_->GetTooltip(i))); + entry->SetString("tooltip", + startup_custom_pages_table_model_->GetTooltip(i)); startup_pages.Append(entry); } diff --git a/chrome/browser/dom_ui/options/search_engine_manager_handler.cc b/chrome/browser/dom_ui/options/search_engine_manager_handler.cc index 25ce098..78c8cd3 100644 --- a/chrome/browser/dom_ui/options/search_engine_manager_handler.cc +++ b/chrome/browser/dom_ui/options/search_engine_manager_handler.cc @@ -156,7 +156,7 @@ DictionaryValue* SearchEngineManagerHandler::CreateDictionaryForHeading( TableModel::Groups groups = list_controller_->table_model()->GetGroups(); DictionaryValue* dict = new DictionaryValue(); - dict->SetString("heading", WideToUTF16Hack(groups[group_index].title)); + dict->SetString("heading", groups[group_index].title); return dict; } @@ -165,10 +165,10 @@ DictionaryValue* SearchEngineManagerHandler::CreateDictionaryForEngine( TemplateURLTableModel* table_model = list_controller_->table_model(); DictionaryValue* dict = new DictionaryValue(); - dict->SetString("name", WideToUTF16Hack(table_model->GetText( - index, IDS_SEARCH_ENGINES_EDITOR_DESCRIPTION_COLUMN))); - dict->SetString("keyword", WideToUTF16Hack(table_model->GetText( - index, IDS_SEARCH_ENGINES_EDITOR_KEYWORD_COLUMN))); + dict->SetString("name", table_model->GetText( + index, IDS_SEARCH_ENGINES_EDITOR_DESCRIPTION_COLUMN)); + dict->SetString("keyword", table_model->GetText( + index, IDS_SEARCH_ENGINES_EDITOR_KEYWORD_COLUMN)); const TemplateURL* template_url = list_controller_->GetTemplateURL(index); GURL icon_url = template_url->GetFavIconURL(); if (icon_url.is_valid()) |