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

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

Issue 2488283003: bluetooth: web: Rename Blacklist to Blocklist (Closed)
Patch Set: bluetooth: web: Rename Blacklist to Blocklist Created 4 years, 1 month 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 2068 matching lines...) Expand 10 before | Expand all | Expand 10 after
2079 2079
2080 if (content_settings->GetContentSetting( 2080 if (content_settings->GetContentSetting(
2081 requesting_origin.GetURL(), embedding_origin.GetURL(), 2081 requesting_origin.GetURL(), embedding_origin.GetURL(),
2082 CONTENT_SETTINGS_TYPE_BLUETOOTH_GUARD, 2082 CONTENT_SETTINGS_TYPE_BLUETOOTH_GUARD,
2083 std::string()) == CONTENT_SETTING_BLOCK) { 2083 std::string()) == CONTENT_SETTING_BLOCK) {
2084 return AllowWebBluetoothResult::BLOCK_POLICY; 2084 return AllowWebBluetoothResult::BLOCK_POLICY;
2085 } 2085 }
2086 return AllowWebBluetoothResult::ALLOW; 2086 return AllowWebBluetoothResult::ALLOW;
2087 } 2087 }
2088 2088
2089 std::string ChromeContentBrowserClient::GetWebBluetoothBlacklist() { 2089 std::string ChromeContentBrowserClient::GetWebBluetoothBlocklist() {
2090 return variations::GetVariationParamValue("WebBluetoothBlacklist", 2090 return variations::GetVariationParamValue("WebBluetoothBlocklist",
2091 "blacklist_additions"); 2091 "blocklist_additions");
2092 } 2092 }
2093 2093
2094 net::URLRequestContext* 2094 net::URLRequestContext*
2095 ChromeContentBrowserClient::OverrideRequestContextForURL( 2095 ChromeContentBrowserClient::OverrideRequestContextForURL(
2096 const GURL& url, content::ResourceContext* context) { 2096 const GURL& url, content::ResourceContext* context) {
2097 DCHECK_CURRENTLY_ON(BrowserThread::IO); 2097 DCHECK_CURRENTLY_ON(BrowserThread::IO);
2098 #if defined(ENABLE_EXTENSIONS) 2098 #if defined(ENABLE_EXTENSIONS)
2099 if (url.SchemeIs(extensions::kExtensionScheme)) { 2099 if (url.SchemeIs(extensions::kExtensionScheme)) {
2100 ProfileIOData* io_data = ProfileIOData::FromResourceContext(context); 2100 ProfileIOData* io_data = ProfileIOData::FromResourceContext(context);
2101 return io_data->extensions_request_context(); 2101 return io_data->extensions_request_context();
(...skipping 1132 matching lines...) Expand 10 before | Expand all | Expand 10 after
3234 kWebRtcDevSwitchNames, 3234 kWebRtcDevSwitchNames,
3235 arraysize(kWebRtcDevSwitchNames)); 3235 arraysize(kWebRtcDevSwitchNames));
3236 } 3236 }
3237 } 3237 }
3238 #endif // defined(ENABLE_WEBRTC) 3238 #endif // defined(ENABLE_WEBRTC)
3239 3239
3240 std::unique_ptr<content::MemoryCoordinatorDelegate> 3240 std::unique_ptr<content::MemoryCoordinatorDelegate>
3241 ChromeContentBrowserClient::GetMemoryCoordinatorDelegate() { 3241 ChromeContentBrowserClient::GetMemoryCoordinatorDelegate() {
3242 return memory::ChromeMemoryCoordinatorDelegate::Create(); 3242 return memory::ChromeMemoryCoordinatorDelegate::Create();
3243 } 3243 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698