Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(435)

Unified Diff: chrome/browser/dom_ui/options/search_engine_manager_handler.cc

Issue 6044007: Remove wstring from TableModel.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/dom_ui/options/search_engine_manager_handler.cc
===================================================================
--- chrome/browser/dom_ui/options/search_engine_manager_handler.cc (revision 70272)
+++ chrome/browser/dom_ui/options/search_engine_manager_handler.cc (working copy)
@@ -156,7 +156,7 @@
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 @@
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())

Powered by Google App Engine
This is Rietveld 408576698