chrome/common/extensions/permissions/chrome_api_permissions.cc - Issue 145663004: Replace "bluetooth" permission with manifest property.

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/common/extensions/permissions/chrome_api_permissions.cc

Issue 145663004: Replace "bluetooth" permission with manifest property. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 11 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

« chrome/common/extensions/api/manifest_types.json ('K') | « chrome/common/extensions/permissions/bluetooth_permission_data.cc ('k') | chrome/test/data/extensions/api_test/bluetooth/discovery_callback/manifest.json » ('j') | chrome/test/data/extensions/api_test/bluetooth/discovery_callback/manifest.json » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/permissions/chrome_api_permissions.cc

diff --git a/chrome/common/extensions/permissions/chrome_api_permissions.cc b/chrome/common/extensions/permissions/chrome_api_permissions.cc

index 314da80369567e714e83b01525ef5bad76604394..1e436a5772cbb163f44f0351318cf09ee81512e1 100644

--- a/chrome/common/extensions/permissions/chrome_api_permissions.cc

+++ b/chrome/common/extensions/permissions/chrome_api_permissions.cc

@@ -4,7 +4,6 @@

#include "chrome/common/extensions/permissions/chrome_api_permissions.h"

-#include "chrome/common/extensions/permissions/bluetooth_permission.h"

#include "chrome/common/extensions/permissions/media_galleries_permission.h"

#include "chrome/common/extensions/permissions/socket_permission.h"

#include "chrome/common/extensions/permissions/usb_device_permission.h"

@@ -330,13 +329,6 @@ std::vector<APIPermissionInfo*> ChromeAPIPermissions::GetAllPermissions()

&CreateAPIPermission<MediaGalleriesPermission> },

{ APIPermission::kPushMessaging, "pushMessaging",

APIPermissionInfo::kFlagCannotBeOptional },

- // Because warning messages for the "bluetooth" permission vary based on

- // the permissions parameters, no message ID or message text is specified

- // here. The message ID and text used will be determined at run-time in the

- // |BluetoothPermission| class.

- { APIPermission::kBluetooth, "bluetooth", APIPermissionInfo::kFlagNone,

- 0, PermissionMessage::kNone,

- &CreateAPIPermission<BluetoothPermission> },

{ APIPermission::kUsb, "usb", APIPermissionInfo::kFlagNone,

IDS_EXTENSION_PROMPT_WARNING_USB,

PermissionMessage::kUsb },