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

Unified Diff: chrome/browser/ui/android/content_settings/subresource_filter_infobar_delegate.cc

Issue 2791843002: [subresource_filter] Add the toggle to the new experimental UI (Closed)
Patch Set: add TODO and crbug link Created 3 years, 8 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/android/content_settings/subresource_filter_infobar_delegate.cc
diff --git a/chrome/browser/ui/android/content_settings/subresource_filter_infobar_delegate.cc b/chrome/browser/ui/android/content_settings/subresource_filter_infobar_delegate.cc
index b24e9979a0cab018d0bec924bf22da0a900e734d..e94ef0e475d7fdca7b37e3031ccfaceee1de134f 100644
--- a/chrome/browser/ui/android/content_settings/subresource_filter_infobar_delegate.cc
+++ b/chrome/browser/ui/android/content_settings/subresource_filter_infobar_delegate.cc
@@ -23,7 +23,9 @@ void SubresourceFilterInfobarDelegate::Create(InfoBarService* infobar_service) {
}
SubresourceFilterInfobarDelegate::SubresourceFilterInfobarDelegate()
- : ConfirmInfoBarDelegate() {}
+ : ConfirmInfoBarDelegate(),
+ using_experimental_infobar_(base::FeatureList::IsEnabled(
+ subresource_filter::kSafeBrowsingSubresourceFilterExperimentalUI)) {}
SubresourceFilterInfobarDelegate::~SubresourceFilterInfobarDelegate() {}
@@ -32,9 +34,17 @@ base::string16 SubresourceFilterInfobarDelegate::GetExplanationText() const {
IDS_FILTERED_DECEPTIVE_CONTENT_PROMPT_EXPLANATION);
}
+// TODO(csharrison): For the time being the experimental infobar will use the
+// PROMPT_RELOAD string for the toggle text. Update this when launch strings are
+// finalized.
+base::string16 SubresourceFilterInfobarDelegate::GetToggleText() const {
+ DCHECK(using_experimental_infobar_);
+ return l10n_util::GetStringUTF16(
+ IDS_FILTERED_DECEPTIVE_CONTENT_PROMPT_RELOAD);
+}
+
bool SubresourceFilterInfobarDelegate::ShouldShowExperimentalInfobar() const {
- return base::FeatureList::IsEnabled(
- subresource_filter::kSafeBrowsingSubresourceFilterExperimentalUI);
+ return using_experimental_infobar_;
}
infobars::InfoBarDelegate::InfoBarIdentifier
@@ -56,9 +66,13 @@ int SubresourceFilterInfobarDelegate::GetButtons() const {
base::string16 SubresourceFilterInfobarDelegate::GetButtonLabel(
InfoBarButton button) const {
+ if (button == BUTTON_OK)
+ return l10n_util::GetStringUTF16(IDS_OK);
+
return l10n_util::GetStringUTF16(
- (button == BUTTON_OK) ? IDS_OK
- : IDS_FILTERED_DECEPTIVE_CONTENT_PROMPT_RELOAD);
+ using_experimental_infobar_
+ ? IDS_FILTERED_DECEPTIVE_CONTENT_RELOAD_ACTION
+ : IDS_FILTERED_DECEPTIVE_CONTENT_PROMPT_RELOAD);
}
bool SubresourceFilterInfobarDelegate::Cancel() {

Powered by Google App Engine
This is Rietveld 408576698