summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-28 03:42:00 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-28 03:42:00 +0000
commita6833b8c7436364df8ff118399a7b38dc7fcebc2 (patch)
tree716a703f5ee4e3d4382c140aec6e424a195aacd4
parent39ded449773c78a47a10cc78a31337512c8412d8 (diff)
downloadchromium_src-a6833b8c7436364df8ff118399a7b38dc7fcebc2.zip
chromium_src-a6833b8c7436364df8ff118399a7b38dc7fcebc2.tar.gz
chromium_src-a6833b8c7436364df8ff118399a7b38dc7fcebc2.tar.bz2
Fix a DCHECK in FontsLanguagesWindowView::GetWindowTitle().
BUG=60878 TEST=see bug Review URL: http://codereview.chromium.org/4158005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64201 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/gtk/options/fonts_languages_window_gtk.cc3
-rw-r--r--chrome/browser/views/options/fonts_languages_window_view.cc3
2 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/gtk/options/fonts_languages_window_gtk.cc b/chrome/browser/gtk/options/fonts_languages_window_gtk.cc
index d51c10e..ce046a9 100644
--- a/chrome/browser/gtk/options/fonts_languages_window_gtk.cc
+++ b/chrome/browser/gtk/options/fonts_languages_window_gtk.cc
@@ -63,8 +63,7 @@ FontsLanguagesWindowGtk::FontsLanguagesWindowGtk(Profile* profile)
fonts_page_(profile_),
languages_page_(profile_) {
dialog_ = gtk_dialog_new_with_buttons(
- l10n_util::GetStringFUTF8(IDS_FONT_LANGUAGE_SETTING_WINDOWS_TITLE,
- l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)).c_str(),
+ l10n_util::GetStringUTF8(IDS_FONT_LANGUAGE_SETTING_WINDOWS_TITLE).c_str(),
// Prefs window is shared between all browser windows.
NULL,
// Non-modal.
diff --git a/chrome/browser/views/options/fonts_languages_window_view.cc b/chrome/browser/views/options/fonts_languages_window_view.cc
index ff6a998d..cab82c7 100644
--- a/chrome/browser/views/options/fonts_languages_window_view.cc
+++ b/chrome/browser/views/options/fonts_languages_window_view.cc
@@ -49,8 +49,7 @@ bool FontsLanguagesWindowView::Accept() {
// FontsLanguagesWindowView, views::WindowDelegate implementation:
std::wstring FontsLanguagesWindowView::GetWindowTitle() const {
- return l10n_util::GetStringF(IDS_FONT_LANGUAGE_SETTING_WINDOWS_TITLE,
- l10n_util::GetString(IDS_PRODUCT_NAME));
+ return l10n_util::GetString(IDS_FONT_LANGUAGE_SETTING_WINDOWS_TITLE);
}
void FontsLanguagesWindowView::WindowClosing() {