Index: chrome/browser/chrome_content_browser_client.cc |
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc |
index b85bffd4f607d443c7ec415e9501b7435d365165..a529ab042216a7c8de0f2ed0b35c7a8bb8d8b7c4 100644 |
--- a/chrome/browser/chrome_content_browser_client.cc |
+++ b/chrome/browser/chrome_content_browser_client.cc |
@@ -1988,6 +1988,21 @@ bool ChromeContentBrowserClient::AllowKeygen( |
CONTENT_SETTING_ALLOW; |
} |
+bool ChromeContentBrowserClient::AllowWebBluetooth( |
+ content::BrowserContext* browser_context, |
+ const url::Origin& requesting_origin, |
+ const url::Origin& embedding_origin) { |
+ HostContentSettingsMap* content_settings = |
bartfab (slow)
2016/02/26 18:00:44
Nit: Const pointer to const.
Jeffrey Yasskin
2016/02/26 18:21:24
Done.
|
+ HostContentSettingsMapFactory::GetForProfile( |
+ Profile::FromBrowserContext(browser_context)); |
+ |
+ return content_settings->GetContentSetting( |
+ GURL(requesting_origin.Serialize()), |
bartfab (slow)
2016/02/26 18:00:45
Nit 1: #include "url/gurl.h"
Nit 2: #include "url/
Jeffrey Yasskin
2016/02/26 18:21:25
Done.
|
+ GURL(embedding_origin.Serialize()), |
+ CONTENT_SETTINGS_TYPE_BLUETOOTH_GUARD, |
bartfab (slow)
2016/02/26 18:00:45
Nit: #include "components/content_settings/core/co
Jeffrey Yasskin
2016/02/26 18:21:25
Done.
|
+ std::string()) != CONTENT_SETTING_BLOCK; |
+} |
+ |
net::URLRequestContext* |
ChromeContentBrowserClient::OverrideRequestContextForURL( |
const GURL& url, content::ResourceContext* context) { |