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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 2488283003: bluetooth: web: Rename Blacklist to Blocklist (Closed)
Patch Set: rebase Created 4 years 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 unified diff | Download patch
OLDNEW
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 2109 matching lines...) Expand 10 before | Expand all | Expand 10 after
2120 2120
2121 if (content_settings->GetContentSetting( 2121 if (content_settings->GetContentSetting(
2122 requesting_origin.GetURL(), embedding_origin.GetURL(), 2122 requesting_origin.GetURL(), embedding_origin.GetURL(),
2123 CONTENT_SETTINGS_TYPE_BLUETOOTH_GUARD, 2123 CONTENT_SETTINGS_TYPE_BLUETOOTH_GUARD,
2124 std::string()) == CONTENT_SETTING_BLOCK) { 2124 std::string()) == CONTENT_SETTING_BLOCK) {
2125 return AllowWebBluetoothResult::BLOCK_POLICY; 2125 return AllowWebBluetoothResult::BLOCK_POLICY;
2126 } 2126 }
2127 return AllowWebBluetoothResult::ALLOW; 2127 return AllowWebBluetoothResult::ALLOW;
2128 } 2128 }
2129 2129
2130 std::string ChromeContentBrowserClient::GetWebBluetoothBlacklist() { 2130 std::string ChromeContentBrowserClient::GetWebBluetoothBlocklist() {
2131 return variations::GetVariationParamValue("WebBluetoothBlacklist", 2131 return variations::GetVariationParamValue("WebBluetoothBlocklist",
2132 "blacklist_additions"); 2132 "blocklist_additions");
2133 } 2133 }
2134 2134
2135 net::URLRequestContext* 2135 net::URLRequestContext*
2136 ChromeContentBrowserClient::OverrideRequestContextForURL( 2136 ChromeContentBrowserClient::OverrideRequestContextForURL(
2137 const GURL& url, content::ResourceContext* context) { 2137 const GURL& url, content::ResourceContext* context) {
2138 DCHECK_CURRENTLY_ON(BrowserThread::IO); 2138 DCHECK_CURRENTLY_ON(BrowserThread::IO);
2139 #if BUILDFLAG(ENABLE_EXTENSIONS) 2139 #if BUILDFLAG(ENABLE_EXTENSIONS)
2140 if (url.SchemeIs(extensions::kExtensionScheme)) { 2140 if (url.SchemeIs(extensions::kExtensionScheme)) {
2141 ProfileIOData* io_data = ProfileIOData::FromResourceContext(context); 2141 ProfileIOData* io_data = ProfileIOData::FromResourceContext(context);
2142 return io_data->extensions_request_context(); 2142 return io_data->extensions_request_context();
(...skipping 1156 matching lines...) Expand 10 before | Expand all | Expand 10 after
3299 render_frame_host, std::move(source), std::move(request)); 3299 render_frame_host, std::move(source), std::move(request));
3300 #else 3300 #else
3301 // Chrome's media remoting implementation depends on the Media Router 3301 // Chrome's media remoting implementation depends on the Media Router
3302 // infrastructure to identify remote sinks and provide the user interface for 3302 // infrastructure to identify remote sinks and provide the user interface for
3303 // sink selection. In the case where the Media Router is not present, simply 3303 // sink selection. In the case where the Media Router is not present, simply
3304 // drop the interface request. This will prevent code paths for media remoting 3304 // drop the interface request. This will prevent code paths for media remoting
3305 // in the renderer process from activating. 3305 // in the renderer process from activating.
3306 #endif 3306 #endif
3307 } 3307 }
3308 #endif // BUILDFLAG(ENABLE_MEDIA_REMOTING) 3308 #endif // BUILDFLAG(ENABLE_MEDIA_REMOTING)
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_client.h ('k') | chrome/browser/web_bluetooth_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698