| OLD | NEW | 
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #include "chrome/browser/chrome_content_browser_client.h" | 5 #include "chrome/browser/chrome_content_browser_client.h" | 
| 6 | 6 | 
| 7 #include <map> | 7 #include <map> | 
| 8 #include <set> | 8 #include <set> | 
| 9 #include <utility> | 9 #include <utility> | 
| 10 #include <vector> | 10 #include <vector> | 
| (...skipping 2096 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2107 | 2107 | 
| 2108   if (content_settings->GetContentSetting( | 2108   if (content_settings->GetContentSetting( | 
| 2109           requesting_origin.GetURL(), embedding_origin.GetURL(), | 2109           requesting_origin.GetURL(), embedding_origin.GetURL(), | 
| 2110           CONTENT_SETTINGS_TYPE_BLUETOOTH_GUARD, | 2110           CONTENT_SETTINGS_TYPE_BLUETOOTH_GUARD, | 
| 2111           std::string()) == CONTENT_SETTING_BLOCK) { | 2111           std::string()) == CONTENT_SETTING_BLOCK) { | 
| 2112     return AllowWebBluetoothResult::BLOCK_POLICY; | 2112     return AllowWebBluetoothResult::BLOCK_POLICY; | 
| 2113   } | 2113   } | 
| 2114   return AllowWebBluetoothResult::ALLOW; | 2114   return AllowWebBluetoothResult::ALLOW; | 
| 2115 } | 2115 } | 
| 2116 | 2116 | 
| 2117 std::string ChromeContentBrowserClient::GetWebBluetoothBlacklist() { | 2117 std::string ChromeContentBrowserClient::GetWebBluetoothBlocklist() { | 
| 2118   return variations::GetVariationParamValue("WebBluetoothBlacklist", | 2118   return variations::GetVariationParamValue("WebBluetoothBlocklist", | 
| 2119                                             "blacklist_additions"); | 2119                                             "blocklist_additions"); | 
| 2120 } | 2120 } | 
| 2121 | 2121 | 
| 2122 net::URLRequestContext* | 2122 net::URLRequestContext* | 
| 2123 ChromeContentBrowserClient::OverrideRequestContextForURL( | 2123 ChromeContentBrowserClient::OverrideRequestContextForURL( | 
| 2124     const GURL& url, content::ResourceContext* context) { | 2124     const GURL& url, content::ResourceContext* context) { | 
| 2125   DCHECK_CURRENTLY_ON(BrowserThread::IO); | 2125   DCHECK_CURRENTLY_ON(BrowserThread::IO); | 
| 2126 #if BUILDFLAG(ENABLE_EXTENSIONS) | 2126 #if BUILDFLAG(ENABLE_EXTENSIONS) | 
| 2127   if (url.SchemeIs(extensions::kExtensionScheme)) { | 2127   if (url.SchemeIs(extensions::kExtensionScheme)) { | 
| 2128     ProfileIOData* io_data = ProfileIOData::FromResourceContext(context); | 2128     ProfileIOData* io_data = ProfileIOData::FromResourceContext(context); | 
| 2129     return io_data->extensions_request_context(); | 2129     return io_data->extensions_request_context(); | 
| (...skipping 1146 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 3276       render_frame_host, std::move(source), std::move(request)); | 3276       render_frame_host, std::move(source), std::move(request)); | 
| 3277 #else | 3277 #else | 
| 3278   // Chrome's media remoting implementation depends on the Media Router | 3278   // Chrome's media remoting implementation depends on the Media Router | 
| 3279   // infrastructure to identify remote sinks and provide the user interface for | 3279   // infrastructure to identify remote sinks and provide the user interface for | 
| 3280   // sink selection. In the case where the Media Router is not present, simply | 3280   // sink selection. In the case where the Media Router is not present, simply | 
| 3281   // drop the interface request. This will prevent code paths for media remoting | 3281   // drop the interface request. This will prevent code paths for media remoting | 
| 3282   // in the renderer process from activating. | 3282   // in the renderer process from activating. | 
| 3283 #endif | 3283 #endif | 
| 3284 } | 3284 } | 
| 3285 #endif  // BUILDFLAG(ENABLE_MEDIA_REMOTING) | 3285 #endif  // BUILDFLAG(ENABLE_MEDIA_REMOTING) | 
| OLD | NEW | 
|---|