chrome/browser/chrome_content_browser_client.cc - Issue 2059543002: bluetooth: Move FactoryWrapper to device and expose a function for testing in chooser controller

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chrome_content_browser_client.h ('k') | content/browser/bluetooth/bluetooth_adapter_factory_wrapper.h » ('j') | content/browser/bluetooth/bluetooth_device_chooser_controller.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 710f5b5b500e9523f2147f14b1cb323231912f7e..cd9b321bbeab3eac083595311f2bb6f9cc7c9280 100644

--- a/chrome/browser/chrome_content_browser_client.cc

+++ b/chrome/browser/chrome_content_browser_client.cc

@@ -1963,6 +1963,10 @@ std::string ChromeContentBrowserClient::GetWebBluetoothBlacklist() {

"blacklist_additions");

}

+base::TimeDelta ChromeContentBrowserClient::GetBluetoothScanDuration() {

+ return base::TimeDelta::FromSeconds(10);

net::URLRequestContext*

ChromeContentBrowserClient::OverrideRequestContextForURL(

const GURL& url, content::ResourceContext* context) {