| Index: chrome/browser/ui/website_settings/mock_permission_bubble_request.cc
|
| diff --git a/chrome/browser/ui/website_settings/mock_permission_bubble_request.cc b/chrome/browser/ui/website_settings/mock_permission_bubble_request.cc
|
| index ce08e3cf97bb262e9821ee0e1d54b3c8d9120c5b..c261fc23f2377b65ea749edca322508ed848e324 100644
|
| --- a/chrome/browser/ui/website_settings/mock_permission_bubble_request.cc
|
| +++ b/chrome/browser/ui/website_settings/mock_permission_bubble_request.cc
|
| @@ -13,7 +13,8 @@ MockPermissionBubbleRequest::MockPermissionBubbleRequest()
|
| "button",
|
| "button",
|
| GURL("http://www.google.com"),
|
| - PermissionBubbleType::UNKNOWN) {}
|
| + PermissionBubbleType::UNKNOWN,
|
| + PermissionBubbleGestureType::UNKNOWN) {}
|
|
|
| MockPermissionBubbleRequest::MockPermissionBubbleRequest(
|
| const std::string& text)
|
| @@ -21,15 +22,19 @@ MockPermissionBubbleRequest::MockPermissionBubbleRequest(
|
| "button",
|
| "button",
|
| GURL("http://www.google.com"),
|
| - PermissionBubbleType::UNKNOWN) {}
|
| + PermissionBubbleType::UNKNOWN,
|
| + PermissionBubbleGestureType::UNKNOWN) {}
|
|
|
| MockPermissionBubbleRequest::MockPermissionBubbleRequest(
|
| - const std::string& text, PermissionBubbleType bubble_type)
|
| + const std::string& text,
|
| + PermissionBubbleType bubble_type,
|
| + PermissionBubbleGestureType gesture_type)
|
| : MockPermissionBubbleRequest(text,
|
| "button",
|
| "button",
|
| GURL("http://www.google.com"),
|
| - bubble_type) {}
|
| + bubble_type,
|
| + gesture_type) {}
|
|
|
| MockPermissionBubbleRequest::MockPermissionBubbleRequest(
|
| const std::string& text,
|
| @@ -38,7 +43,8 @@ MockPermissionBubbleRequest::MockPermissionBubbleRequest(
|
| "button",
|
| "button",
|
| url,
|
| - PermissionBubbleType::UNKNOWN) {}
|
| + PermissionBubbleType::UNKNOWN,
|
| + PermissionBubbleGestureType::UNKNOWN) {}
|
|
|
| MockPermissionBubbleRequest::MockPermissionBubbleRequest(
|
| const std::string& text,
|
| @@ -48,7 +54,8 @@ MockPermissionBubbleRequest::MockPermissionBubbleRequest(
|
| accept_label,
|
| deny_label,
|
| GURL("http://www.google.com"),
|
| - PermissionBubbleType::UNKNOWN) {}
|
| + PermissionBubbleType::UNKNOWN,
|
| + PermissionBubbleGestureType::UNKNOWN) {}
|
|
|
| MockPermissionBubbleRequest::~MockPermissionBubbleRequest() {}
|
|
|
| @@ -87,6 +94,11 @@ PermissionBubbleType MockPermissionBubbleRequest::GetPermissionBubbleType()
|
| return bubble_type_;
|
| }
|
|
|
| +PermissionBubbleGestureType MockPermissionBubbleRequest::GetGestureType()
|
| + const {
|
| + return gesture_type_;
|
| +}
|
| +
|
| bool MockPermissionBubbleRequest::granted() {
|
| return granted_;
|
| }
|
| @@ -104,11 +116,13 @@ MockPermissionBubbleRequest::MockPermissionBubbleRequest(
|
| const std::string& accept_label,
|
| const std::string& deny_label,
|
| const GURL& origin,
|
| - PermissionBubbleType bubble_type)
|
| + PermissionBubbleType bubble_type,
|
| + PermissionBubbleGestureType gesture_type)
|
| : granted_(false),
|
| cancelled_(false),
|
| finished_(false),
|
| - bubble_type_(bubble_type) {
|
| + bubble_type_(bubble_type),
|
| + gesture_type_(gesture_type) {
|
| text_ = base::UTF8ToUTF16(text);
|
| accept_label_ = base::UTF8ToUTF16(accept_label);
|
| deny_label_ = base::UTF8ToUTF16(deny_label);
|
|
|