| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "extensions/common/manifest_handlers/file_handler_info.h" | 5 #include "extensions/common/manifest_handlers/file_handler_info.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include <memory> |
| 10 |
| 10 #include "base/strings/string_number_conversions.h" | 11 #include "base/strings/string_number_conversions.h" |
| 11 #include "base/strings/stringprintf.h" | 12 #include "base/strings/stringprintf.h" |
| 12 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" |
| 13 #include "base/values.h" | 14 #include "base/values.h" |
| 14 #include "extensions/common/error_utils.h" | 15 #include "extensions/common/error_utils.h" |
| 15 #include "extensions/common/manifest.h" | 16 #include "extensions/common/manifest.h" |
| 16 #include "extensions/common/manifest_constants.h" | 17 #include "extensions/common/manifest_constants.h" |
| 17 | 18 |
| 18 namespace extensions { | 19 namespace extensions { |
| 19 | 20 |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 InstallWarning(base::StringPrintf(kNotRecognized, it.key().c_str()), | 128 InstallWarning(base::StringPrintf(kNotRecognized, it.key().c_str()), |
| 128 keys::kFileHandlers, | 129 keys::kFileHandlers, |
| 129 it.key())); | 130 it.key())); |
| 130 } | 131 } |
| 131 } | 132 } |
| 132 | 133 |
| 133 return true; | 134 return true; |
| 134 } | 135 } |
| 135 | 136 |
| 136 bool FileHandlersParser::Parse(Extension* extension, base::string16* error) { | 137 bool FileHandlersParser::Parse(Extension* extension, base::string16* error) { |
| 137 scoped_ptr<FileHandlers> info(new FileHandlers); | 138 std::unique_ptr<FileHandlers> info(new FileHandlers); |
| 138 const base::DictionaryValue* all_handlers = NULL; | 139 const base::DictionaryValue* all_handlers = NULL; |
| 139 if (!extension->manifest()->GetDictionary(keys::kFileHandlers, | 140 if (!extension->manifest()->GetDictionary(keys::kFileHandlers, |
| 140 &all_handlers)) { | 141 &all_handlers)) { |
| 141 *error = base::ASCIIToUTF16(errors::kInvalidFileHandlers); | 142 *error = base::ASCIIToUTF16(errors::kInvalidFileHandlers); |
| 142 return false; | 143 return false; |
| 143 } | 144 } |
| 144 | 145 |
| 145 std::vector<InstallWarning> install_warnings; | 146 std::vector<InstallWarning> install_warnings; |
| 146 for (base::DictionaryValue::Iterator iter(*all_handlers); | 147 for (base::DictionaryValue::Iterator iter(*all_handlers); |
| 147 !iter.IsAtEnd(); | 148 !iter.IsAtEnd(); |
| (...skipping 29 matching lines...) Expand all Loading... |
| 177 extension->SetManifestData(keys::kFileHandlers, info.release()); | 178 extension->SetManifestData(keys::kFileHandlers, info.release()); |
| 178 extension->AddInstallWarnings(install_warnings); | 179 extension->AddInstallWarnings(install_warnings); |
| 179 return true; | 180 return true; |
| 180 } | 181 } |
| 181 | 182 |
| 182 const std::vector<std::string> FileHandlersParser::Keys() const { | 183 const std::vector<std::string> FileHandlersParser::Keys() const { |
| 183 return SingleKey(keys::kFileHandlers); | 184 return SingleKey(keys::kFileHandlers); |
| 184 } | 185 } |
| 185 | 186 |
| 186 } // namespace extensions | 187 } // namespace extensions |
| OLD | NEW |