summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
authorrpaquay@chromium.org <rpaquay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-12 01:40:16 +0000
committerrpaquay@chromium.org <rpaquay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-12 01:40:16 +0000
commitc0c64f8700f65e07704c992068abad215deb9c3b (patch)
tree32f2ca9cc6aaaa4634affaeef058e1237fc88658 /extensions
parent4a98a96db7b4f94e49c13ae0b17d99ec237e31b4 (diff)
downloadchromium_src-c0c64f8700f65e07704c992068abad215deb9c3b.zip
chromium_src-c0c64f8700f65e07704c992068abad215deb9c3b.tar.gz
chromium_src-c0c64f8700f65e07704c992068abad215deb9c3b.tar.bz2
Replace "bluetooth" permission with manifest property.
BUG=336824 Review URL: https://codereview.chromium.org/145663004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250599 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions')
-rw-r--r--extensions/common/manifest_constants.cc1
-rw-r--r--extensions/common/manifest_constants.h1
-rw-r--r--extensions/common/permissions/api_permission.h1
3 files changed, 2 insertions, 1 deletions
diff --git a/extensions/common/manifest_constants.cc b/extensions/common/manifest_constants.cc
index ff6acb1..f7bf1f4 100644
--- a/extensions/common/manifest_constants.cc
+++ b/extensions/common/manifest_constants.cc
@@ -16,6 +16,7 @@ const char kBackgroundPage[] = "background.page";
const char kBackgroundPageLegacy[] = "background_page";
const char kBackgroundPersistent[] = "background.persistent";
const char kBackgroundScripts[] = "background.scripts";
+const char kBluetooth[] = "bluetooth";
const char kBookmarkUI[] = "chrome_settings_overrides.bookmarks_ui";
const char kBrowserAction[] = "browser_action";
const char kChromeURLOverrides[] = "chrome_url_overrides";
diff --git a/extensions/common/manifest_constants.h b/extensions/common/manifest_constants.h
index f008281..a9c39fe 100644
--- a/extensions/common/manifest_constants.h
+++ b/extensions/common/manifest_constants.h
@@ -18,6 +18,7 @@ extern const char kBackgroundPage[];
extern const char kBackgroundPageLegacy[];
extern const char kBackgroundPersistent[];
extern const char kBackgroundScripts[];
+extern const char kBluetooth[];
extern const char kBookmarkUI[];
extern const char kBrowserAction[];
extern const char kBrowseURLs[];
diff --git a/extensions/common/permissions/api_permission.h b/extensions/common/permissions/api_permission.h
index 6427e57..aaf1d6e 100644
--- a/extensions/common/permissions/api_permission.h
+++ b/extensions/common/permissions/api_permission.h
@@ -44,7 +44,6 @@ class APIPermission {
kAudioCapture,
kAutoTestPrivate,
kBackground,
- kBluetooth,
kBookmark,
kBookmarkManagerPrivate,
kBrailleDisplayPrivate,