Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2309)

Unified Diff: chrome/browser/chromeos/file_system_provider/service.cc

Issue 1077823005: Declare providing extension capabilities in the manifest. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed tests. Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/file_system_provider/service.h ('k') | chrome/chrome_common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/file_system_provider/service.cc
diff --git a/chrome/browser/chromeos/file_system_provider/service.cc b/chrome/browser/chromeos/file_system_provider/service.cc
index 18854f824e8660f6b7c0542278bb29ea51d9010c..6dccf4017bcafd72dd65fb8558cbfeeaec5ef46a 100644
--- a/chrome/browser/chromeos/file_system_provider/service.cc
+++ b/chrome/browser/chromeos/file_system_provider/service.cc
@@ -43,8 +43,7 @@ ProvidedFileSystemInterface* CreateProvidedFileSystem(
} // namespace
-ProvidingExtensionInfo::ProvidingExtensionInfo()
- : can_configure(false), can_add(false) {
+ProvidingExtensionInfo::ProvidingExtensionInfo() {
}
ProvidingExtensionInfo::~ProvidingExtensionInfo() {
@@ -309,10 +308,6 @@ std::vector<ProvidingExtensionInfo> Service::GetProvidingExtensionInfoList()
extensions::ExtensionRegistry::Get(profile_);
DCHECK(registry);
- extensions::EventRouter* const router =
- extensions::EventRouter::Get(profile_);
- DCHECK(router);
-
std::vector<ProvidingExtensionInfo> result;
for (const auto& extension : registry->enabled_extensions()) {
if (!extension->permissions_data()->HasAPIPermission(
@@ -323,13 +318,11 @@ std::vector<ProvidingExtensionInfo> Service::GetProvidingExtensionInfoList()
ProvidingExtensionInfo info;
info.extension_id = extension->id();
info.name = extension->name();
- info.can_configure = router->ExtensionHasEventListener(
- extension->id(), extensions::api::file_system_provider::
- OnConfigureRequested::kEventName);
- info.can_add = router->ExtensionHasEventListener(
- extension->id(),
- extensions::api::file_system_provider::OnMountRequested::kEventName);
-
+ const extensions::FileSystemProviderCapabilities* capabilities =
+ extensions::FileSystemProviderCapabilities::Get(extension.get());
+ info.capabilities = capabilities
+ ? *capabilities
+ : extensions::FileSystemProviderCapabilities();
result.push_back(info);
}
« no previous file with comments | « chrome/browser/chromeos/file_system_provider/service.h ('k') | chrome/chrome_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698