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

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

Issue 1569963002: Make the Permission Bubble Manager use a correct same-origin check. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/website_settings/permission_bubble_manager.cc
diff --git a/chrome/browser/ui/website_settings/permission_bubble_manager.cc b/chrome/browser/ui/website_settings/permission_bubble_manager.cc
index 9f21c8adc08af3aee0c39a6f94e4d58e533d7711..0c657f2e614a14696a297200dbd241bcf7b1474e 100644
--- a/chrome/browser/ui/website_settings/permission_bubble_manager.cc
+++ b/chrome/browser/ui/website_settings/permission_bubble_manager.cc
@@ -12,6 +12,7 @@
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/navigation_details.h"
#include "content/public/browser/user_metrics.h"
+#include "url/origin.h"
#if !defined(OS_ANDROID)
#include "chrome/browser/ui/browser_finder.h"
@@ -105,7 +106,8 @@ void PermissionBubbleManager::AddRequest(PermissionBubbleRequest* request) {
// any request for which GetVisibleURL != GetLastCommittedURL.
request_url_ = web_contents()->GetLastCommittedURL();
bool is_main_frame =
- request->GetRequestingHostname().GetOrigin() == request_url_.GetOrigin();
+ url::Origin(request_url_)
+ .IsSameOriginWith(url::Origin(request->GetRequestingHostname()));
// Don't re-add an existing request or one with a duplicate text request.
bool same_object = false;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698