| 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/options_page_info.h" | 5 #include "extensions/common/manifest_handlers/options_page_info.h" |
| 6 | 6 |
| 7 #include "base/files/file_util.h" | 7 #include "base/files/file_util.h" |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 10 #include "extensions/common/api/extensions_manifest_types.h" | 10 #include "extensions/common/api/extensions_manifest_types.h" |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 174 const Manifest* manifest = extension->manifest(); | 174 const Manifest* manifest = extension->manifest(); |
| 175 | 175 |
| 176 std::string options_page_string; | 176 std::string options_page_string; |
| 177 if (manifest->HasPath(keys::kOptionsPage) && | 177 if (manifest->HasPath(keys::kOptionsPage) && |
| 178 !manifest->GetString(keys::kOptionsPage, &options_page_string)) { | 178 !manifest->GetString(keys::kOptionsPage, &options_page_string)) { |
| 179 *error = ErrorUtils::FormatErrorMessageUTF16(errors::kInvalidOptionsPage, | 179 *error = ErrorUtils::FormatErrorMessageUTF16(errors::kInvalidOptionsPage, |
| 180 keys::kOptionsPage); | 180 keys::kOptionsPage); |
| 181 return false; | 181 return false; |
| 182 } | 182 } |
| 183 | 183 |
| 184 const base::Value* options_ui_value = NULL; | 184 const base::Value* options_ui_value = nullptr; |
| 185 ignore_result(manifest->Get(keys::kOptionsUI, &options_ui_value)); | 185 ignore_result(manifest->Get(keys::kOptionsUI, &options_ui_value)); |
| 186 | 186 |
| 187 scoped_ptr<OptionsPageInfo> info = | 187 scoped_ptr<OptionsPageInfo> info = |
| 188 OptionsPageInfo::Create(extension, | 188 OptionsPageInfo::Create(extension, |
| 189 options_ui_value, | 189 options_ui_value, |
| 190 options_page_string, | 190 options_page_string, |
| 191 &install_warnings, | 191 &install_warnings, |
| 192 error); | 192 error); |
| 193 if (!info) | 193 if (!info) |
| 194 return false; | 194 return false; |
| (...skipping 22 matching lines...) Expand all Loading... |
| 217 } | 217 } |
| 218 return true; | 218 return true; |
| 219 } | 219 } |
| 220 | 220 |
| 221 const std::vector<std::string> OptionsPageManifestHandler::Keys() const { | 221 const std::vector<std::string> OptionsPageManifestHandler::Keys() const { |
| 222 static const char* keys[] = {keys::kOptionsPage, keys::kOptionsUI}; | 222 static const char* keys[] = {keys::kOptionsPage, keys::kOptionsUI}; |
| 223 return std::vector<std::string>(keys, keys + arraysize(keys)); | 223 return std::vector<std::string>(keys, keys + arraysize(keys)); |
| 224 } | 224 } |
| 225 | 225 |
| 226 } // namespace extensions | 226 } // namespace extensions |
| OLD | NEW |