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

Unified Diff: chrome/browser/chromeos/extensions/file_manager/private_api_misc.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 | « no previous file | chrome/browser/chromeos/extensions/file_manager/private_api_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
index ba1f7570f6f07b09fa0b0f524044da0dde6f7e58..6a28f8d0d4c7af6d8a3dcf9f7100e2d59627afdb 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
@@ -32,6 +32,7 @@
#include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
#include "chrome/common/extensions/api/file_manager_private.h"
+#include "chrome/common/extensions/api/manifest_types.h"
#include "chrome/common/pref_names.h"
#include "components/signin/core/browser/profile_oauth2_token_service.h"
#include "components/signin/core/browser/signin_manager.h"
@@ -491,8 +492,22 @@ FileManagerPrivateGetProvidingExtensionsFunction::Run() {
new ProvidingExtension);
providing_extension->extension_id = info.extension_id;
providing_extension->name = info.name;
- providing_extension->can_configure = info.can_configure;
- providing_extension->can_add = info.can_add;
+ providing_extension->configurable = info.capabilities.configurable();
+ providing_extension->multiple_mounts = info.capabilities.multiple_mounts();
+ switch (info.capabilities.source()) {
+ case SOURCE_FILE:
+ providing_extension->source =
+ api::manifest_types::FILE_SYSTEM_PROVIDER_SOURCE_FILE;
+ break;
+ case SOURCE_DEVICE:
+ providing_extension->source =
+ api::manifest_types::FILE_SYSTEM_PROVIDER_SOURCE_DEVICE;
+ break;
+ case SOURCE_NETWORK:
+ providing_extension->source =
+ api::manifest_types::FILE_SYSTEM_PROVIDER_SOURCE_NETWORK;
+ break;
+ }
providing_extensions.push_back(providing_extension);
}
@@ -538,7 +553,6 @@ FileManagerPrivateConfigureProvidedFileSystemFunction::Run() {
using file_manager::Volume;
VolumeManager* const volume_manager =
VolumeManager::Get(chrome_details_.GetProfile());
- LOG(ERROR) << "LOOKING FOR: " << params->volume_id;
base::WeakPtr<Volume> volume =
volume_manager->FindVolumeById(params->volume_id);
if (!volume.get())
« no previous file with comments | « no previous file | chrome/browser/chromeos/extensions/file_manager/private_api_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698