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

chrome/browser/ui/website_settings/permission_bubble_request.h

Index: chrome/browser/ui/website_settings/permission_bubble_request.h
diff --git a/chrome/browser/ui/website_settings/permission_bubble_request.h b/chrome/browser/ui/website_settings/permission_bubble_request.h
index 4beec272c94c47cea63c09e2f339a12ac6181efb..c0e7be608ef2da9f7ccad2e06a95090032ded0a9 100644
--- a/chrome/browser/ui/website_settings/permission_bubble_request.h
+++ b/chrome/browser/ui/website_settings/permission_bubble_request.h
@@ -19,31 +19,24 @@ class PermissionBubbleRequest {
  public:
   virtual ~PermissionBubbleRequest() {}
 
+  // The icon to use next to the message text fragment in the permission bubble.
+  // Must be a valid icon of size 16x16. (TODO(gbillock): tbd size)

[groby-ooo-7-16, 2014/02/25 22:27:36]

So is size tbd or 16x16? :)

[Greg Billock, 2014/02/26 00:28:44]

:-) This is more like "when we decide, write that size here instead of 16x16"

+  virtual int GetIconID() const = 0;

[groby-ooo-7-16, 2014/02/25 22:27:36]

I'm wondering if it's worth making a const icon_id_ member on the base class and
passing the ID in the ctor

Slightly less boilerplate for derived classes, but an impure base class.

[Greg Billock, 2014/02/26 00:28:44]

Yeah, the same suggestion was made for the strings as well. The pure interface
is nice, so I've left it like that for now.

+
   // Returns the full prompt text for this permission. This is the only text
   // that will be shown in the single-permission case and should be phrased
   // positively as a complete sentence.
   virtual base::string16 GetMessageText() const = 0;
 
   // Returns the shortened prompt text for this permission.  Must be phrased
-  // positively -- the permission bubble may coalesce different requests, and
-  // if it does, this text will be displayed next to a bullet or checkbox
-  // indicating the user grants the permission.
+  // as a heading, so like "Location" or "Camera". The permission bubble may

[groby-ooo-7-16, 2014/02/25 22:27:36]

"for example" or "e.g." instead of "so like"

[Greg Billock, 2014/02/26 00:28:44]

Done.

+  // coalesce different requests, and if it does, this text will be displayed
+  // next to an image and indicate the user grants the permission.
   virtual base::string16 GetMessageTextFragment() const = 0;
 
-  // May return alternative text for the accept button in the case where this
-  // single permission request is triggered in the bubble. If it returns an
-  // empty string the default is used.
-  // If the permission request is coalesced, the text will revert to the default
-  // "Accept"-alike, so the message text must be clear enough for users to
-  // understand even if this text is not used.
-  virtual base::string16 GetAlternateAcceptButtonText() const = 0;
-
-  // May return alternative text for the deny button in the case where this
-  // single permission request is triggered in the bubble. If it returns an
-  // empty string the default is used. This text may not be used at all,
-  // so the |GetMessageText()| prompt should be clear enough to convey the
-  // permission request with generic button text.
-  virtual base::string16 GetAlternateDenyButtonText() const = 0;
+  // Get whether this request was accompanied by a user gesture. User gestured
+  // permissions requests will not be suppressed.
+  virtual bool HasUserGesture() const = 0;
 
   // Called when the user has granted the requested permission.
   virtual void PermissionGranted() = 0;