Index: chrome/browser/chrome_content_browser_client.h |
diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h |
index c53e0f596f023eaa2962c533907b7cbd3a80caa0..b6fbdf4ba4c0a586890646a8c29f9ae50527aa6f 100644 |
--- a/chrome/browser/chrome_content_browser_client.h |
+++ b/chrome/browser/chrome_content_browser_client.h |
@@ -19,6 +19,8 @@ |
#include "base/memory/scoped_ptr.h" |
#endif |
+class Profile; |
+ |
namespace base { |
class CommandLine; |
} |
@@ -212,6 +214,11 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { |
bool user_gesture, |
base::Callback<void(bool)> result_callback, |
base::Closure* cancel_callback) OVERRIDE; |
+ virtual void UseContentSettingPermission( |
+ content::WebContents* web_contents, |
+ const GURL& primary_url, |
+ const GURL& secondary_url, |
+ const std::string& setting_type) OVERRIDE; |
virtual void RequestProtectedMediaIdentifierPermission( |
content::WebContents* web_contents, |
const GURL& origin, |
@@ -294,6 +301,11 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { |
#endif |
private: |
+ void UseContentSettingPermissionHelper(Profile* web_contents, |
Michael van Ouwerkerk
2014/07/01 11:02:23
s/web_contents/profile/
Daniel Nishi
2014/07/01 18:37:48
"Helper" is gone now, so effectively done.
|
+ const GURL& primary_url, |
+ const GURL& secondary_url, |
+ const std::string& setting_type); |
+ |
#if defined(ENABLE_WEBRTC) |
// Copies disable WebRTC encryption switch depending on the channel. |
static void MaybeCopyDisableWebRtcEncryptionSwitch( |