diff options
| author | mad@google.com <mad@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-21 20:13:19 +0000 |
|---|---|---|
| committer | mad@google.com <mad@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-21 20:13:19 +0000 |
| commit | ad5884208a5691a5a501d5d315749095a04b70a5 (patch) | |
| tree | d13f44dab7a5462a67b7848cb5c58662d3147678 /chrome | |
| parent | c4f289ab59b003462c0c4231e49f26985ccab1cc (diff) | |
| download | chromium_src-ad5884208a5691a5a501d5d315749095a04b70a5.zip chromium_src-ad5884208a5691a5a501d5d315749095a04b70a5.tar.gz chromium_src-ad5884208a5691a5a501d5d315749095a04b70a5.tar.bz2 | |
Prevent App extensions to be returned by AutomationProvider::GetEnabledExtensions().
These are not useful for testing and are causing CEEE problems, since it expects a single extension being installed.
A better fix might be to not have any default extension installed with Chromium and only have them with a branded Chrome so that they don't show up in Chrome Frame or CEEE installs... Maybe... Started a conversation with the Chrome Apps and Extensions team to discuss that.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/6008004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69867 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/automation/automation_provider.cc | 6 | ||||
| -rw-r--r-- | chrome/common/automation_messages_internal.h | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index 4108f69..888db0c 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -797,8 +797,10 @@ void AutomationProvider::GetEnabledExtensions( for (size_t i = 0; i < extensions->size(); ++i) { const Extension* extension = (*extensions)[i]; DCHECK(extension); - if (extension->location() == Extension::INTERNAL || - extension->location() == Extension::LOAD) { + // AutomationProvider only exposes non app internal/loaded extensions. + if (!extension->is_app() && + (extension->location() == Extension::INTERNAL || + extension->location() == Extension::LOAD)) { result->push_back(extension->path()); } } diff --git a/chrome/common/automation_messages_internal.h b/chrome/common/automation_messages_internal.h index 5086bfc..1f6925c 100644 --- a/chrome/common/automation_messages_internal.h +++ b/chrome/common/automation_messages_internal.h @@ -1136,10 +1136,9 @@ IPC_SYNC_MESSAGE_ROUTED1_1(AutomationMsg_LoadExpandedExtension, // Retrieves a list of the root directories of all enabled extensions // that have been installed into Chrome by dropping a .crx file onto // Chrome or an equivalent action (including loaded extensions). -// Other types of extensions are not included on the list (e.g. "component" -// or "external" extensions) since they are generally not useful for testing -// (e.g. an external extension could mess with an automated test if it's -// present on some systems only). +// Other types of extensions are not included on the list (e.g. "component", +// "app" or "external" extensions) since since CEEE does not yet support them +// (and it actually only support a single extension in its profile for now). IPC_SYNC_MESSAGE_ROUTED0_1(AutomationMsg_GetEnabledExtensions, std::vector<FilePath>) |