| Index: chrome/browser/notifications/desktop_notification_service.cc
|
| diff --git a/chrome/browser/notifications/desktop_notification_service.cc b/chrome/browser/notifications/desktop_notification_service.cc
|
| index 9dc9d9824d6b59ce454404c8ffa8e40f8fe73614..bf74779e6fbb6a49f0c2b6aeb0c616bdc75b7e39 100644
|
| --- a/chrome/browser/notifications/desktop_notification_service.cc
|
| +++ b/chrome/browser/notifications/desktop_notification_service.cc
|
| @@ -77,10 +77,10 @@ class NotificationPermissionRequest : public PermissionBubbleRequest {
|
| virtual ~NotificationPermissionRequest();
|
|
|
| // PermissionBubbleDelegate:
|
| + virtual int GetIconID() const OVERRIDE;
|
| virtual base::string16 GetMessageText() const OVERRIDE;
|
| virtual base::string16 GetMessageTextFragment() const OVERRIDE;
|
| - virtual base::string16 GetAlternateAcceptButtonText() const OVERRIDE;
|
| - virtual base::string16 GetAlternateDenyButtonText() const OVERRIDE;
|
| + virtual bool HasUserGesture() const OVERRIDE;
|
| virtual void PermissionGranted() OVERRIDE;
|
| virtual void PermissionDenied() OVERRIDE;
|
| virtual void Cancelled() OVERRIDE;
|
| @@ -126,6 +126,10 @@ NotificationPermissionRequest::NotificationPermissionRequest(
|
|
|
| NotificationPermissionRequest::~NotificationPermissionRequest() {}
|
|
|
| +int NotificationPermissionRequest::GetIconID() const {
|
| + return IDR_INFOBAR_DESKTOP_NOTIFICATIONS;
|
| +}
|
| +
|
| base::string16 NotificationPermissionRequest::GetMessageText() const {
|
| return l10n_util::GetStringFUTF16(IDS_NOTIFICATION_PERMISSIONS,
|
| display_name_);
|
| @@ -136,14 +140,9 @@ NotificationPermissionRequest::GetMessageTextFragment() const {
|
| return l10n_util::GetStringUTF16(IDS_NOTIFICATION_PERMISSIONS_FRAGMENT);
|
| }
|
|
|
| -base::string16
|
| -NotificationPermissionRequest::GetAlternateAcceptButtonText() const {
|
| - return l10n_util::GetStringUTF16(IDS_NOTIFICATION_PERMISSION_YES);
|
| -}
|
| -
|
| -base::string16
|
| -NotificationPermissionRequest::GetAlternateDenyButtonText() const {
|
| - return l10n_util::GetStringUTF16(IDS_NOTIFICATION_PERMISSION_NO);
|
| +bool NotificationPermissionRequest::HasUserGesture() const {
|
| + // TODO(gbillock): plumb this through
|
| + return false;
|
| }
|
|
|
| void NotificationPermissionRequest::PermissionGranted() {
|
|
|