Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4751)

Unified Diff: chrome/browser/ui/website_settings/mock_permission_bubble_request.cc

Issue 292453009: Handles iframe permissions requests separately, in a subsequent bubble. (Closed) Base URL: https://chromium.googlesource.com/chromium/src
Patch Set: fixed duplicate logic Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 300a6974c4f26c2e805deaccda067291066faed6..cb1bcab5792b9552c82c77249d4f1136c8431372 100644
--- a/chrome/browser/ui/website_settings/mock_permission_bubble_request.cc
+++ b/chrome/browser/ui/website_settings/mock_permission_bubble_request.cc
@@ -13,6 +13,7 @@ MockPermissionBubbleRequest::MockPermissionBubbleRequest()
text_ = base::ASCIIToUTF16("test");
accept_label_ = base::ASCIIToUTF16("button");
deny_label_ = base::ASCIIToUTF16("button");
+ hostname_ = GURL("http://www.google.com");
}
MockPermissionBubbleRequest::MockPermissionBubbleRequest(
@@ -21,6 +22,16 @@ MockPermissionBubbleRequest::MockPermissionBubbleRequest(
text_ = base::UTF8ToUTF16(text);
accept_label_ = base::ASCIIToUTF16("button");
deny_label_ = base::ASCIIToUTF16("button");
+ hostname_ = GURL("http://www.google.com");
+}
+
+MockPermissionBubbleRequest::MockPermissionBubbleRequest(
+ const std::string& text, const GURL& url)
+ : granted_(false), cancelled_(false), finished_(false) {
+ text_ = base::UTF8ToUTF16(text);
+ accept_label_ = base::ASCIIToUTF16("button");
+ deny_label_ = base::ASCIIToUTF16("button");
+ hostname_ = url;
}
MockPermissionBubbleRequest::MockPermissionBubbleRequest(
@@ -30,6 +41,7 @@ MockPermissionBubbleRequest::MockPermissionBubbleRequest(
text_ = base::UTF8ToUTF16(text);
accept_label_ = base::UTF8ToUTF16(accept_label);
deny_label_ = base::UTF8ToUTF16(deny_label);
+ hostname_ = GURL("http://www.google.com");
}
MockPermissionBubbleRequest::~MockPermissionBubbleRequest() {}
@@ -52,7 +64,7 @@ bool MockPermissionBubbleRequest::HasUserGesture() const {
}
GURL MockPermissionBubbleRequest::GetRequestingHostname() const {
- return GURL("http://www.google.com");
+ return hostname_;
}
void MockPermissionBubbleRequest::PermissionGranted() {

Powered by Google App Engine
This is Rietveld 408576698