Skip to content

GitLab

T
tangled
Commit aa0c3c9c authored by mtomasz's avatar mtomasz Committed by Commit bot
Browse files
Options

Rename "file_system_provider" to "file_system_provider_capabilities". 

This CL renames the section in the manifest, so it's more meaningful.

TEST=Refactoring only.
BUG=474146

Review URL: https://codereview.chromium.org/1137813003

Cr-Commit-Position: refs/heads/master@{#329316}
parent 8fa739b6
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 35 deletions
chrome/browser/chromeos/file_system_provider/registry.h
View file @ aa0c3c9c
......@@ -10,7 +10,6 @@
#include "base/memory/scoped_ptr.h"
#include "chrome/browser/chromeos/file_system_provider/registry_interface.h"
#include "chrome/browser/chromeos/file_system_provider/watcher.h"
#include "chrome/common/extensions/api/file_system_provider/file_system_provider_handler.h"
class Profile;
......
chrome/browser/chromeos/file_system_provider/service.h
View file @ aa0c3c9c
......@@ -23,7 +23,7 @@
#include "chrome/browser/chromeos/file_system_provider/watcher.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/extensions/api/file_system_provider.h"
#include "chrome/common/extensions/api/file_system_provider/file_system_provider_handler.h"
#include "chrome/common/extensions/api/file_system_provider_capabilities/file_system_provider_capabilities_handler.h"
#include "components/keyed_service/core/keyed_service.h"
#include "content/public/browser/browser_context.h"
#include "extensions/browser/extension_registry_observer.h"
......
chrome/chrome_common.gypi
View file @ aa0c3c9c
......@@ -207,8 +207,8 @@
'chrome_common_extensions_chromeos_sources': [
'common/extensions/api/file_browser_handlers/file_browser_handler.cc',
'common/extensions/api/file_browser_handlers/file_browser_handler.h',
'common/extensions/api/file_system_provider/file_system_provider_handler.cc',
'common/extensions/api/file_system_provider/file_system_provider_handler.h',
'common/extensions/api/file_system_provider_capabilities/file_system_provider_capabilities_handler.cc',
'common/extensions/api/file_system_provider_capabilities/file_system_provider_capabilities_handler.h',
'common/extensions/api/input_ime/input_components_handler.cc',
'common/extensions/api/input_ime/input_components_handler.h',
],
......
chrome/common/extensions/api/_manifest_features.json
View file @ aa0c3c9c
......@@ -152,12 +152,10 @@
"location": "component"
}
],
"file_system_provider": [
{
"channel": "dev",
"extension_types": ["extension", "platform_app"]
}
],
"file_system_provider_capabilities": {
"channel": "dev",
"extension_types": ["extension", "platform_app"]
},
"homepage_url": {
"channel": "stable",
"extension_types": ["extension", "legacy_packaged_app"]
......
chrome/common/extensions/api/file_system_provider/file_system_provider_handler.cc → chrome/common/extensions/api/file_system_provider_capabilities/file_system_provider_capabilities_handler.cc
View file @ aa0c3c9c
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/common/extensions/api/file_system_provider/file_system_provider_handler.h"
#include "chrome/common/extensions/api/file_system_provider_capabilities/file_system_provider_capabilities_handler.h"
#include "base/memory/scoped_ptr.h"
#include "base/strings/utf_string_conversions.h"
......@@ -30,24 +30,26 @@ FileSystemProviderCapabilities::FileSystemProviderCapabilities(
FileSystemProviderCapabilities::~FileSystemProviderCapabilities() {
}
FileSystemProviderHandler::FileSystemProviderHandler() {
FileSystemProviderCapabilitiesHandler::FileSystemProviderCapabilitiesHandler() {
}
FileSystemProviderHandler::~FileSystemProviderHandler() {
FileSystemProviderCapabilitiesHandler::
~FileSystemProviderCapabilitiesHandler() {
}
// static
const FileSystemProviderCapabilities* FileSystemProviderCapabilities::Get(
const Extension* extension) {
return static_cast<FileSystemProviderCapabilities*>(
extension->GetManifestData(manifest_keys::kFileSystemProvider));
extension->GetManifestData(
manifest_keys::kFileSystemProviderCapabilities));
}
bool FileSystemProviderHandler::Parse(Extension* extension,
base::string16* error) {
bool FileSystemProviderCapabilitiesHandler::Parse(Extension* extension,
base::string16* error) {
const base::DictionaryValue* section = NULL;
extension->manifest()->GetDictionary(manifest_keys::kFileSystemProvider,
&section);
extension->manifest()->GetDictionary(
manifest_keys::kFileSystemProviderCapabilities, &section);
DCHECK(section);
api::manifest_types::FileSystemProviderCapabilities idl_capabilities;
......@@ -76,13 +78,14 @@ bool FileSystemProviderHandler::Parse(Extension* extension,
idl_capabilities.multiple_mounts,
source));
extension->SetManifestData(manifest_keys::kFileSystemProvider,
extension->SetManifestData(manifest_keys::kFileSystemProviderCapabilities,
capabilities.release());
return true;
}
const std::vector<std::string> FileSystemProviderHandler::Keys() const {
return SingleKey(manifest_keys::kFileSystemProvider);
const std::vector<std::string> FileSystemProviderCapabilitiesHandler::Keys()
const {
return SingleKey(manifest_keys::kFileSystemProviderCapabilities);
}
} // namespace extensions
chrome/common/extensions/api/file_system_provider/file_system_provider_handler.h → chrome/common/extensions/api/file_system_provider_capabilities/file_system_provider_capabilities_handler.h
View file @ aa0c3c9c
......@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CHROME_COMMON_EXTENSIONS_API_FILE_SYSTEM_PROVIDER_FILE_SYSTEM_PROVIDER_HANDLER_H_
#define CHROME_COMMON_EXTENSIONS_API_FILE_SYSTEM_PROVIDER_FILE_SYSTEM_PROVIDER_HANDLER_H_
#ifndef CHROME_COMMON_EXTENSIONS_API_FILE_SYSTEM_PROVIDER_CAPABILITIES_FILE_SYSTEM_PROVIDER_CAPABILITIES_HANDLER_H_
#define CHROME_COMMON_EXTENSIONS_API_FILE_SYSTEM_PROVIDER_CAPABILITIES_FILE_SYSTEM_PROVIDER_CAPABILITIES_HANDLER_H_
#include <string>
#include <vector>
......@@ -40,11 +40,11 @@ class FileSystemProviderCapabilities : public Extension::ManifestData {
FileSystemProviderSource source_;
};
// Parses the "file_system_provider" manifest key.
class FileSystemProviderHandler : public ManifestHandler {
// Parses the "file_system_provider_capabilities" manifest key.
class FileSystemProviderCapabilitiesHandler : public ManifestHandler {
public:
FileSystemProviderHandler();
~FileSystemProviderHandler() override;
FileSystemProviderCapabilitiesHandler();
~FileSystemProviderCapabilitiesHandler() override;
// ManifestHandler overrides.
bool Parse(Extension* extension, base::string16* error) override;
......@@ -52,9 +52,9 @@ class FileSystemProviderHandler : public ManifestHandler {
private:
const std::vector<std::string> Keys() const override;
DISALLOW_COPY_AND_ASSIGN(FileSystemProviderHandler);
DISALLOW_COPY_AND_ASSIGN(FileSystemProviderCapabilitiesHandler);
};
} // namespace extensions
#endif // CHROME_COMMON_EXTENSIONS_API_FILE_SYSTEM_PROVIDER_FILE_SYSTEM_PROVIDER_HANDLER_H_
#endif // CHROME_COMMON_EXTENSIONS_API_FILE_SYSTEM_PROVIDER_CAPABILITIES_FILE_SYSTEM_PROVIDER_CAPABILITIES_HANDLER_H_
chrome/common/extensions/chrome_manifest_handlers.cc
View file @ aa0c3c9c
......@@ -31,7 +31,7 @@
#if defined(OS_CHROMEOS)
#include "chrome/common/extensions/api/file_browser_handlers/file_browser_handler.h"
#include "chrome/common/extensions/api/file_system_provider/file_system_provider_handler.h"
#include "chrome/common/extensions/api/file_system_provider_capabilities/file_system_provider_capabilities_handler.h"
#include "chrome/common/extensions/api/input_ime/input_components_handler.h"
#endif
......@@ -68,7 +68,7 @@ void RegisterChromeManifestHandlers() {
(new URLOverridesHandler)->Register();
#if defined(OS_CHROMEOS)
(new FileBrowserHandlerParser)->Register();
(new FileSystemProviderHandler)->Register();
(new FileSystemProviderCapabilitiesHandler)->Register();
(new InputComponentsHandler)->Register();
#endif
}
......
chrome/test/data/extensions/api_test/file_system_provider/configure/manifest.json
View file @ aa0c3c9c
......@@ -13,7 +13,7 @@
},
"fileManagerPrivate"
],
"file_system_provider": {
"file_system_provider_capabilities": {
"configurable": true,
"multiple_mounts": false,
"source": "device"
......
chrome/test/data/extensions/api_test/file_system_provider/mount/manifest.json
View file @ aa0c3c9c
......@@ -6,7 +6,7 @@
"manifest_version": 2,
"description": "Test for chrome.fileSystemProvider.mount().",
"permissions": ["fileSystemProvider", "fileManagerPrivate"],
"file_system_provider": {
"file_system_provider_capabilities": {
"configurable": false,
"multiple_mounts": true,
"source": "network"
......
extensions/common/manifest_constants.cc
View file @ aa0c3c9c
......@@ -185,7 +185,8 @@ const char kWebviewName[] = "name";
const char kWebviewPartitions[] = "partitions";
const char kWhitelist[] = "whitelist";
#if defined(OS_CHROMEOS)
const char kFileSystemProvider[] = "file_system_provider";
const char kFileSystemProviderCapabilities[] =
"file_system_provider_capabilities";
#endif
} // namespace manifest_keys
......
extensions/common/manifest_constants.h
View file @ aa0c3c9c
......@@ -186,7 +186,7 @@ extern const char kWebviewAccessibleResources[];
extern const char kWebviewPartitions[];
extern const char kWhitelist[];
#if defined(OS_CHROMEOS)
extern const char kFileSystemProvider[];
extern const char kFileSystemProviderCapabilities[];
#endif
} // namespace manifest_keys
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment