diff options
| -rw-r--r-- | chrome/browser/views/options/general_page_view.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/views/shelf_item_dialog.cc | 10 |
2 files changed, 12 insertions, 3 deletions
diff --git a/chrome/browser/views/options/general_page_view.cc b/chrome/browser/views/options/general_page_view.cc index fa44545..f315c27 100644 --- a/chrome/browser/views/options/general_page_view.cc +++ b/chrome/browser/views/options/general_page_view.cc @@ -31,6 +31,7 @@ #include "grit/app_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" +#include "net/base/net_util.h" #include "third_party/skia/include/core/SkBitmap.h" #include "views/controls/button/radio_button.h" #include "views/controls/label.h" @@ -301,9 +302,11 @@ int CustomHomePagesTableModel::RowCount() { std::wstring CustomHomePagesTableModel::GetText(int row, int column_id) { DCHECK(column_id == 0); DCHECK(row >= 0 && row < RowCount()); + std::wstring languages = + profile_->GetPrefs()->GetString(prefs::kAcceptLanguages); // No need to force URL to have LTR directionality because the custom home // pages control is created using LTR directionality. - return UTF8ToWide(entries_[row].url.spec()); + return net::FormatUrl(entries_[row].url, languages); } SkBitmap CustomHomePagesTableModel::GetIcon(int row) { diff --git a/chrome/browser/views/shelf_item_dialog.cc b/chrome/browser/views/shelf_item_dialog.cc index f5ccb2d..ebe7fd9 100644 --- a/chrome/browser/views/shelf_item_dialog.cc +++ b/chrome/browser/views/shelf_item_dialog.cc @@ -494,8 +494,14 @@ bool ShelfItemDialog::AcceleratorPressed( void ShelfItemDialog::OnSelectionChanged() { int selection = url_table_->FirstSelectedRow(); if (selection >= 0 && selection < url_table_model_->RowCount()) { - url_field_->SetText( - UTF8ToWide(url_table_model_->GetURL(selection).spec())); + std::wstring languages = + profile_->GetPrefs()->GetString(prefs::kAcceptLanguages); + // Because the url_field_ is user-editable, we set the URL with + // username:password and escaped path and query. + std::wstring formatted = net::FormatUrl( + url_table_model_->GetURL(selection), languages, + false, false, NULL, NULL); + url_field_->SetText(formatted); if (title_field_) title_field_->SetText(url_table_model_->GetTitle(selection)); GetDialogClientView()->UpdateDialogButtons(); |