summaryrefslogtreecommitdiffstats
path: root/extensions/common/extension.h
diff options
context:
space:
mode:
authortreib <treib@chromium.org>2015-11-04 03:29:41 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-04 11:30:29 +0000
commit3b91e9fa7d3e9b792f8a9ffa713a5e7d74d7b983 (patch)
tree899cc45c45d58727e7126c28f420bac8e8390b59 /extensions/common/extension.h
parent1f9589b284dc7f7091eaaaa1cab0cc3cc7a3efe7 (diff)
downloadchromium_src-3b91e9fa7d3e9b792f8a9ffa713a5e7d74d7b983.zip
chromium_src-3b91e9fa7d3e9b792f8a9ffa713a5e7d74d7b983.tar.gz
chromium_src-3b91e9fa7d3e9b792f8a9ffa713a5e7d74d7b983.tar.bz2
Extension sync cleanup: get rid of DISABLE_UNKNOWN_FROM_SYNC
If we get weird/incomplete data from Sync, then ExtensionSyncService should handle that, rather than passing the ball to ExtensionService. BUG=None Review URL: https://codereview.chromium.org/1411723012 Cr-Commit-Position: refs/heads/master@{#357798}
Diffstat (limited to 'extensions/common/extension.h')
-rw-r--r--extensions/common/extension.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/extensions/common/extension.h b/extensions/common/extension.h
index 17925cb..f2c24d6 100644
--- a/extensions/common/extension.h
+++ b/extensions/common/extension.h
@@ -92,7 +92,7 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
DISABLE_RELOAD = 1 << 2,
DISABLE_UNSUPPORTED_REQUIREMENT = 1 << 3,
DISABLE_SIDELOAD_WIPEOUT = 1 << 4,
- DISABLE_UNKNOWN_FROM_SYNC = 1 << 5,
+ DEPRECATED_DISABLE_UNKNOWN_FROM_SYNC = 1 << 5,
// DISABLE_PERMISSIONS_CONSENT = 1 << 6, // Deprecated.
// DISABLE_KNOWN_DISABLED = 1 << 7, // Deprecated.
DISABLE_NOT_VERIFIED = 1 << 8, // Disabled because we could not verify
@@ -102,8 +102,8 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
DISABLE_REMOTE_INSTALL = 1 << 11,
DISABLE_INACTIVE_EPHEMERAL_APP = 1 << 12, // Cached ephemeral apps are
// disabled to prevent activity.
- DISABLE_EXTERNAL_EXTENSION = 1 << 13, // External extensions might be
- // disabled for user prompting.
+ DISABLE_EXTERNAL_EXTENSION = 1 << 13, // External extensions might be
+ // disabled for user prompting.
DISABLE_UPDATE_REQUIRED_BY_POLICY = 1 << 14, // Doesn't meet minimum
// version requirement.
DISABLE_REASON_LAST = 1 << 15, // This should always be the last value