Index: chrome/browser/content_settings/permission_context_base.cc |
diff --git a/chrome/browser/content_settings/permission_context_base.cc b/chrome/browser/content_settings/permission_context_base.cc |
index 405f45e4084b14da1ccc8d47c6c4ed734a269f50..8a49548dfe4b034d3714192575323d5ec611c861 100644 |
--- a/chrome/browser/content_settings/permission_context_base.cc |
+++ b/chrome/browser/content_settings/permission_context_base.cc |
@@ -48,6 +48,16 @@ void PermissionContextBase::RequestPermission( |
callback); |
} |
+ContentSetting PermissionContextBase::PermissionStatus( |
+ const GURL& requesting_origin, |
+ const GURL& embedder_origin) { |
+ return |
+ profile_->GetHostContentSettingsMap() |
mlamouri (slow - plz ping)
2014/10/16 09:04:57
nit: do you really need a line break here?
Miguel Garcia
2014/10/16 13:50:26
Done.
|
+ ->GetContentSetting( |
+ requesting_origin, embedder_origin, permission_type_, std::string()); |
+} |
+ |
+ |
void PermissionContextBase::CancelPermissionRequest( |
content::WebContents* web_contents, |
const PermissionRequestID& id) { |