chrome/browser/extensions/api/bluetooth_socket/bluetooth_socket_api.cc - Issue 325893002: Bluetooth: add socket & low_energy manifest check

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/extensions/api/bluetooth_socket/bluetooth_socket_api.cc

Issue 325893002: Bluetooth: add socket & low_energy manifest check (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: add permission denied tests Created 6 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/extensions/api/bluetooth_low_energy/bluetooth_low_energy_apitest.cc ('k') | chrome/browser/extensions/api/bluetooth_socket/bluetooth_socket_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/bluetooth_socket/bluetooth_socket_api.cc

diff --git a/chrome/browser/extensions/api/bluetooth_socket/bluetooth_socket_api.cc b/chrome/browser/extensions/api/bluetooth_socket/bluetooth_socket_api.cc

index 49143d4e081da560a6e801d19d88d018d62b216c..1005cc07879507aea6ea2d46d79c174a1e1d4263 100644

--- a/chrome/browser/extensions/api/bluetooth_socket/bluetooth_socket_api.cc

+++ b/chrome/browser/extensions/api/bluetooth_socket/bluetooth_socket_api.cc

@@ -97,6 +97,11 @@ bool BluetoothSocketAsyncApiFunction::RunAsync() {

}

bool BluetoothSocketAsyncApiFunction::PrePrepare() {

+ if (!BluetoothManifestData::CheckSocketPermitted(GetExtension())) {

+ error_ = kPermissionDeniedError;

+ return false;

+ }

manager_ = ApiResourceManager<BluetoothApiSocket>::Get(browser_context());

DCHECK(manager_)

<< "There is no socket manager. "