diff options
author | elijahtaylor@chromium.org <elijahtaylor@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-18 05:35:09 +0000 |
---|---|---|
committer | elijahtaylor@chromium.org <elijahtaylor@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-18 05:35:09 +0000 |
commit | b86960e25dfce1fbf3151f5322133e696030ccc3 (patch) | |
tree | 3a3d0dc06a4869bd0dc664cceeecbd2ecdfae100 /extensions/common/extension.cc | |
parent | 047c3d690e605651baec69a86ce443cff4859105 (diff) | |
download | chromium_src-b86960e25dfce1fbf3151f5322133e696030ccc3.zip chromium_src-b86960e25dfce1fbf3151f5322133e696030ccc3.tar.gz chromium_src-b86960e25dfce1fbf3151f5322133e696030ccc3.tar.bz2 |
Improve messaging for shared modules on chrome://extensions
List the dependent extensions under the shared module and change message
from generic policy message to be more specific for shared modules
to explain why the extension cannot be disabled or uninstalled.
BUG=393670
Review URL: https://codereview.chromium.org/403593002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284010 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions/common/extension.cc')
-rw-r--r-- | extensions/common/extension.cc | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc index f19ef51..89d50f0 100644 --- a/extensions/common/extension.cc +++ b/extensions/common/extension.cc @@ -411,11 +411,11 @@ void Extension::AddInstallWarnings( } bool Extension::is_app() const { - return manifest_->is_app(); + return manifest()->is_app(); } bool Extension::is_platform_app() const { - return manifest_->is_platform_app(); + return manifest()->is_platform_app(); } bool Extension::is_hosted_app() const { @@ -430,6 +430,14 @@ bool Extension::is_extension() const { return manifest()->is_extension(); } +bool Extension::is_shared_module() const { + return manifest()->is_shared_module(); +} + +bool Extension::is_theme() const { + return manifest()->is_theme(); +} + bool Extension::can_be_incognito_enabled() const { // Only component platform apps are supported in incognito. return !is_platform_app() || location() == Manifest::COMPONENT; @@ -443,10 +451,6 @@ void Extension::AddWebExtentPattern(const URLPattern& pattern) { extent_.AddPattern(pattern); } -bool Extension::is_theme() const { - return manifest()->is_theme(); -} - // static bool Extension::InitExtensionID(extensions::Manifest* manifest, const base::FilePath& path, |