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

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

Issue 2059543002: bluetooth: Move FactoryWrapper to device and expose a function for testing in chooser controller (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@my-origin
Patch Set: Fix typo Created 4 years, 6 months 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 1945 matching lines...) Expand 10 before | Expand all | Expand 10 after
1956 return AllowWebBluetoothResult::BLOCK_POLICY; 1956 return AllowWebBluetoothResult::BLOCK_POLICY;
1957 } 1957 }
1958 return AllowWebBluetoothResult::ALLOW; 1958 return AllowWebBluetoothResult::ALLOW;
1959 } 1959 }
1960 1960
1961 std::string ChromeContentBrowserClient::GetWebBluetoothBlacklist() { 1961 std::string ChromeContentBrowserClient::GetWebBluetoothBlacklist() {
1962 return variations::GetVariationParamValue("WebBluetoothBlacklist", 1962 return variations::GetVariationParamValue("WebBluetoothBlacklist",
1963 "blacklist_additions"); 1963 "blacklist_additions");
1964 } 1964 }
1965 1965
1966 base::TimeDelta ChromeContentBrowserClient::GetBluetoothScanDuration() {
1967 return base::TimeDelta::FromSeconds(10);
1968 }
1969
1966 net::URLRequestContext* 1970 net::URLRequestContext*
1967 ChromeContentBrowserClient::OverrideRequestContextForURL( 1971 ChromeContentBrowserClient::OverrideRequestContextForURL(
1968 const GURL& url, content::ResourceContext* context) { 1972 const GURL& url, content::ResourceContext* context) {
1969 DCHECK_CURRENTLY_ON(BrowserThread::IO); 1973 DCHECK_CURRENTLY_ON(BrowserThread::IO);
1970 #if defined(ENABLE_EXTENSIONS) 1974 #if defined(ENABLE_EXTENSIONS)
1971 if (url.SchemeIs(extensions::kExtensionScheme)) { 1975 if (url.SchemeIs(extensions::kExtensionScheme)) {
1972 ProfileIOData* io_data = ProfileIOData::FromResourceContext(context); 1976 ProfileIOData* io_data = ProfileIOData::FromResourceContext(context);
1973 return io_data->extensions_request_context(); 1977 return io_data->extensions_request_context();
1974 } 1978 }
1975 #endif 1979 #endif
(...skipping 986 matching lines...) Expand 10 before | Expand all | Expand 10 after
2962 if (channel <= kMaxDisableEncryptionChannel) { 2966 if (channel <= kMaxDisableEncryptionChannel) {
2963 static const char* const kWebRtcDevSwitchNames[] = { 2967 static const char* const kWebRtcDevSwitchNames[] = {
2964 switches::kDisableWebRtcEncryption, 2968 switches::kDisableWebRtcEncryption,
2965 }; 2969 };
2966 to_command_line->CopySwitchesFrom(from_command_line, 2970 to_command_line->CopySwitchesFrom(from_command_line,
2967 kWebRtcDevSwitchNames, 2971 kWebRtcDevSwitchNames,
2968 arraysize(kWebRtcDevSwitchNames)); 2972 arraysize(kWebRtcDevSwitchNames));
2969 } 2973 }
2970 } 2974 }
2971 #endif // defined(ENABLE_WEBRTC) 2975 #endif // defined(ENABLE_WEBRTC)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698