[WebsiteSettings] Change permission bubble API to adapt to new mocks.

chrome/browser/notifications/desktop_notification_service.cc

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..a64f80f62f856e8ab7d7111036306a92fd9af8ee 100644
--- a/chrome/browser/notifications/desktop_notification_service.cc
+++ b/chrome/browser/notifications/desktop_notification_service.cc
@@ -77,10 +77,11 @@ 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 GURL GetRequestingHostname() const OVERRIDE;
   virtual void PermissionGranted() OVERRIDE;
   virtual void PermissionDenied() OVERRIDE;
   virtual void Cancelled() OVERRIDE;
@@ -126,6 +127,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 +141,13 @@ NotificationPermissionRequest::GetMessageTextFragment() const {
   return l10n_util::GetStringUTF16(IDS_NOTIFICATION_PERMISSIONS_FRAGMENT);
 }
 
-base::string16
-NotificationPermissionRequest::GetAlternateAcceptButtonText() const {
-  return l10n_util::GetStringUTF16(IDS_NOTIFICATION_PERMISSION_YES);

[dewittj, 2014/02/27 00:19:43]

Does this mean that Yes/No is the default?

[Greg Billock, 2014/02/27 00:39:44]

Current plan is that the bubbles will always say "Allow" and "Block" with no
override possible.

+bool NotificationPermissionRequest::HasUserGesture() const {
+  // TODO(gbillock): plumb this through
+  return false;

[dewittj, 2014/02/27 00:19:43]

Chrome requires that the requestPermission method be called in response to a
user gesture (i.e. in onClick handlers).  So this could probably just return
true?

[Greg Billock, 2014/02/27 00:39:44]

Yes. I discovered this doing the plumbing. :-) I think the subsequent CL takes
out this TODO and adds that note, but I can just as well do it here.

 }
 
-base::string16
-NotificationPermissionRequest::GetAlternateDenyButtonText() const {
-  return l10n_util::GetStringUTF16(IDS_NOTIFICATION_PERMISSION_NO);
+GURL NotificationPermissionRequest::GetRequestingHostname() const {
+  return origin_;
 }
 
 void NotificationPermissionRequest::PermissionGranted() {