summaryrefslogtreecommitdiffstats
path: root/extensions/common/permissions
diff options
context:
space:
mode:
authortapted <tapted@chromium.org>2015-09-08 17:34:00 -0700
committerCommit bot <commit-bot@chromium.org>2015-09-09 00:34:32 +0000
commit841c14b4ca8818f08890157ba159e331a1995453 (patch)
tree4712c160280bc77a2b9e772a24df69516f575902 /extensions/common/permissions
parent3e2b051608a8061cc8e97cab402c40c3767416d6 (diff)
downloadchromium_src-841c14b4ca8818f08890157ba159e331a1995453.zip
chromium_src-841c14b4ca8818f08890157ba159e331a1995453.tar.gz
chromium_src-841c14b4ca8818f08890157ba159e331a1995453.tar.bz2
Disable extension Panels on Dev and Canary, except for the whitelist
They're already disabled on Beta and Stable channels. Leaving them enabled in Dev/Canary confuses users and makes people suspect regressions. After this, panels are only enabled when --enable-panels is set in chrome://flags and for the whitelist (Hangouts). CL also tries to consolidate all the Hangouts extension IDs scattered around the codebase. BUG=467808, 526708 Review URL: https://codereview.chromium.org/1329033002 Cr-Commit-Position: refs/heads/master@{#347847}
Diffstat (limited to 'extensions/common/permissions')
-rw-r--r--extensions/common/permissions/permissions_data.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/extensions/common/permissions/permissions_data.cc b/extensions/common/permissions/permissions_data.cc
index 8e5e4b5..ad45cd5 100644
--- a/extensions/common/permissions/permissions_data.cc
+++ b/extensions/common/permissions/permissions_data.cc
@@ -78,7 +78,7 @@ bool PermissionsData::ScriptsMayRequireActionForExtension(
bool PermissionsData::ShouldSkipPermissionWarnings(
const std::string& extension_id) {
// See http://b/4946060 for more details.
- return extension_id == std::string("nckgahadagoaajjgafhacjanaoiihapd");
+ return extension_id == extension_misc::kProdHangoutsExtensionId;
}
// static