Index: chrome/common/extensions/api/file_handlers/file_handlers_parser.cc |
diff --git a/chrome/common/extensions/api/file_handlers/file_handlers_parser.cc b/chrome/common/extensions/api/file_handlers/file_handlers_parser.cc |
index 894e37e9f779d2ce100011890087cad2d8eaff1a..99178696592fe78d604f248ca5de0d22d85bec5b 100644 |
--- a/chrome/common/extensions/api/file_handlers/file_handlers_parser.cc |
+++ b/chrome/common/extensions/api/file_handlers/file_handlers_parser.cc |
@@ -12,6 +12,8 @@ |
#include "chrome/common/extensions/manifest.h" |
#include "extensions/common/error_utils.h" |
+namespace keys = extension_manifest_keys; |
+ |
namespace extensions { |
FileHandlerInfo::FileHandlerInfo() {} |
@@ -45,17 +47,16 @@ bool LoadFileHandler(const std::string& handler_id, |
const ListValue* mime_types = NULL; |
// TODO(benwells): handle file extensions. |
- if (!handler_info.HasKey(extension_manifest_keys::kFileHandlerTypes) || |
- !handler_info.GetList(extension_manifest_keys::kFileHandlerTypes, |
- &mime_types) || mime_types->GetSize() == 0) { |
+ if (!handler_info.HasKey(keys::kFileHandlerTypes) || |
+ !handler_info.GetList(keys::kFileHandlerTypes, &mime_types) || |
+ mime_types->GetSize() == 0) { |
*error = ErrorUtils::FormatErrorMessageUTF16( |
extension_manifest_errors::kInvalidFileHandlerType, handler_id); |
return false; |
} |
- if (handler_info.HasKey(extension_manifest_keys::kFileHandlerTitle) && |
- !handler_info.GetString(extension_manifest_keys::kFileHandlerTitle, |
- &handler.title)) { |
+ if (handler_info.HasKey(keys::kFileHandlerTitle) && |
+ !handler_info.GetString(keys::kFileHandlerTitle, &handler.title)) { |
*error = ASCIIToUTF16(extension_manifest_errors::kInvalidFileHandlerTitle); |
return false; |
} |
@@ -78,8 +79,8 @@ bool LoadFileHandler(const std::string& handler_id, |
bool FileHandlersParser::Parse(Extension* extension, string16* error) { |
scoped_ptr<FileHandlers> info(new FileHandlers); |
const DictionaryValue* all_handlers = NULL; |
- if (!extension->manifest()->GetDictionary( |
- extension_manifest_keys::kFileHandlers, &all_handlers)) { |
+ if (!extension->manifest()->GetDictionary(keys::kFileHandlers, |
+ &all_handlers)) { |
*error = ASCIIToUTF16(extension_manifest_errors::kInvalidFileHandlers); |
return false; |
} |
@@ -99,9 +100,12 @@ bool FileHandlersParser::Parse(Extension* extension, string16* error) { |
} |
} |
- extension->SetManifestData(extension_manifest_keys::kFileHandlers, |
- info.release()); |
+ extension->SetManifestData(keys::kFileHandlers, info.release()); |
return true; |
} |
+const std::vector<std::string> FileHandlersParser::Keys() const { |
+ return SingleKey(keys::kFileHandlers); |
+} |
+ |
} // namespace extensions |