diff options
| author | ortuno <ortuno@chromium.org> | 2015-09-04 22:45:44 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-05 05:46:30 +0000 |
| commit | 8d36b4e664b0b136fdb2edcddb78b5bec2e8444f (patch) | |
| tree | f18955c4a103d8094cf5bed0fdd12d412dcf9e65 /extensions/common/features | |
| parent | 96a41570c4da3e5c470fa2eaa4a8b11daf618899 (diff) | |
| download | chromium_src-8d36b4e664b0b136fdb2edcddb78b5bec2e8444f.zip chromium_src-8d36b4e664b0b136fdb2edcddb78b5bec2e8444f.tar.gz chromium_src-8d36b4e664b0b136fdb2edcddb78b5bec2e8444f.tar.bz2 | |
bluetooth-advertising: Remove whitelist, add kiosk mode or flag requirement.
Per discussion in apps-dev:
https://groups.google.com/a/chromium.org/d/msg/apps-dev/Itv1JFIyznM/MFr3NLgRCQAJ
1. Removed the whitelist
2. Allowed API in apps that are auto launched and in kiosk mode
3. Allowed API if the enable-ble-advertising-in-apps flag is enabled
BUG=528066
Review URL: https://codereview.chromium.org/1321413002
Cr-Commit-Position: refs/heads/master@{#347564}
Diffstat (limited to 'extensions/common/features')
| -rw-r--r-- | extensions/common/features/behavior_feature.cc | 3 | ||||
| -rw-r--r-- | extensions/common/features/behavior_feature.h | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/extensions/common/features/behavior_feature.cc b/extensions/common/features/behavior_feature.cc index 1f99c71..393a76b 100644 --- a/extensions/common/features/behavior_feature.cc +++ b/extensions/common/features/behavior_feature.cc @@ -6,9 +6,6 @@ namespace extensions { -const char* const BehaviorFeature::kBluetoothPeripheral = - "bluetooth.peripheral"; - const char* const BehaviorFeature::kServiceWorker = "service_worker"; const char* const BehaviorFeature::kWhitelistedForIncognito = diff --git a/extensions/common/features/behavior_feature.h b/extensions/common/features/behavior_feature.h index 4af02954..62f78ea 100644 --- a/extensions/common/features/behavior_feature.h +++ b/extensions/common/features/behavior_feature.h @@ -19,7 +19,6 @@ namespace extensions { class BehaviorFeature : public SimpleFeature { public: // Constants corresponding to keys in _behavior_features.json. - static const char* const kBluetoothPeripheral; static const char* const kServiceWorker; static const char* const kWhitelistedForIncognito; static const char* const kDoNotSync; |