Commit 54617c54 authored by Matthew Jones's avatar Matthew Jones Committed by Commit Bot

Add block button to popup block infobar for touchless

Bug: 971278
Change-Id: Ia9cbff98874774b17b2326cda3a6e491dc8486eb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1645896Reviewed-by: default avatarTheresa <twellington@chromium.org>
Reviewed-by: default avatarYaron Friedman <yfriedman@chromium.org>
Commit-Queue: Matthew Jones <mdjones@chromium.org>
Commit-Queue: Yaron Friedman <yfriedman@chromium.org>
Auto-Submit: Matthew Jones <mdjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#666774}
parent 9c69ddbf
......@@ -8,6 +8,7 @@
#include <utility>
#include "chrome/browser/android/android_theme_resources.h"
#include "chrome/browser/android/feature_utilities.h"
#include "chrome/browser/content_settings/chrome_content_settings_utils.h"
#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
#include "chrome/browser/infobars/infobar_service.h"
......@@ -92,12 +93,25 @@ int PopupBlockedInfoBarDelegate::GetButtons() const {
if (!can_show_popups_)
return 0;
return BUTTON_OK;
int buttons = BUTTON_OK;
if (chrome::android::IsNoTouchModeEnabled())
buttons |= BUTTON_CANCEL;
return buttons;
}
base::string16 PopupBlockedInfoBarDelegate::GetButtonLabel(
InfoBarButton button) const {
return l10n_util::GetStringUTF16(IDS_POPUPS_BLOCKED_INFOBAR_BUTTON_SHOW);
switch (button) {
case BUTTON_OK:
return l10n_util::GetStringUTF16(IDS_POPUPS_BLOCKED_INFOBAR_BUTTON_SHOW);
case BUTTON_CANCEL:
return l10n_util::GetStringUTF16(IDS_PERMISSION_DENY);
default:
NOTREACHED();
break;
}
return base::string16();
}
bool PopupBlockedInfoBarDelegate::Accept() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment