summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/gtk/options/passwords_page_gtk.cc1
-rw-r--r--net/base/net_util.cc2
2 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/gtk/options/passwords_page_gtk.cc b/chrome/browser/gtk/options/passwords_page_gtk.cc
index 02ab15c..be47c06 100644
--- a/chrome/browser/gtk/options/passwords_page_gtk.cc
+++ b/chrome/browser/gtk/options/passwords_page_gtk.cc
@@ -203,6 +203,7 @@ void PasswordsPageGtk::OnRemoveAllButtonClicked(GtkButton* widget,
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_QUESTION,
GTK_BUTTONS_YES_NO,
+ "%s",
l10n_util::GetStringUTF8(
IDS_PASSWORDS_PAGE_VIEW_TEXT_DELETE_ALL_PASSWORDS).c_str());
gtk_window_set_modal(GTK_WINDOW(confirm), TRUE);
diff --git a/net/base/net_util.cc b/net/base/net_util.cc
index 0280338..d51181c 100644
--- a/net/base/net_util.cc
+++ b/net/base/net_util.cc
@@ -638,7 +638,7 @@ bool IsIDNComponentSafe(const char16* str,
std::string languages_list(WideToASCII(languages));
StringTokenizer t(languages_list, ",");
while (t.GetNext()) {
- if (safe = IsComponentCoveredByLang(component_characters, t.token()))
+ if ((safe = IsComponentCoveredByLang(component_characters, t.token())))
break;
}
return safe;