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

Unified Diff: chrome/browser/ui/content_settings/content_setting_bubble_model.cc

Issue 267103002: Ignore title parameter for navigator.registerProtocolHandler. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix tests Created 6 years, 7 months 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/ui/content_settings/content_setting_bubble_model.cc
diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
index 9806d92861a33b6c62dc1d8dafedd30c02fbb1ba..2acc49698b1cf1f11cbe5ec009093b2ccdbdab24 100644
--- a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
@@ -1031,23 +1031,22 @@ ContentSettingRPHBubbleModel::ContentSettingRPHBubbleModel(
protocol = base::UTF8ToUTF16(pending_handler_.protocol());
}
+ // Note that we ignore the |title| parameter.
if (previous_handler_.IsEmpty()) {
set_title(l10n_util::GetStringFUTF8(
IDS_REGISTER_PROTOCOL_HANDLER_CONFIRM,
- pending_handler_.title(),
base::UTF8ToUTF16(pending_handler_.url().host()),
protocol));
} else {
set_title(l10n_util::GetStringFUTF8(
IDS_REGISTER_PROTOCOL_HANDLER_CONFIRM_REPLACE,
- pending_handler_.title(),
base::UTF8ToUTF16(pending_handler_.url().host()),
- protocol, previous_handler_.title()));
+ protocol,
+ base::UTF8ToUTF16(previous_handler_.url().host())));
}
std::string radio_allow_label =
- l10n_util::GetStringFUTF8(IDS_REGISTER_PROTOCOL_HANDLER_ACCEPT,
- pending_handler_.title());
+ l10n_util::GetStringUTF8(IDS_REGISTER_PROTOCOL_HANDLER_ACCEPT);
std::string radio_deny_label =
l10n_util::GetStringUTF8(IDS_REGISTER_PROTOCOL_HANDLER_DENY);
std::string radio_ignore_label =
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698