Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/requirements_info.h" | 5 #include "extensions/common/manifest_handlers/requirements_info.h" |
| 6 | 6 |
| 7 #include "base/lazy_instance.h" | 7 #include "base/lazy_instance.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 "base/values.h" | 10 #include "base/values.h" |
| 11 #include "extensions/common/error_utils.h" | 11 #include "extensions/common/error_utils.h" |
| 12 #include "extensions/common/manifest_constants.h" | 12 #include "extensions/common/manifest_constants.h" |
| 13 | 13 |
| 14 namespace extensions { | 14 namespace extensions { |
| 15 | 15 |
| 16 namespace keys = manifest_keys; | 16 namespace keys = manifest_keys; |
| 17 namespace errors = manifest_errors; | 17 namespace errors = manifest_errors; |
| 18 | 18 |
| 19 RequirementsInfo::RequirementsInfo(const Manifest* manifest) | 19 RequirementsInfo::RequirementsInfo(const Manifest* manifest) |
| 20 : webgl(false), | 20 : webgl(false), |
| 21 css3d(false), | |
| 22 npapi(false), | 21 npapi(false), |
| 23 window_shape(false) { | 22 window_shape(false) { |
| 24 // Before parsing requirements from the manifest, automatically default the | 23 // Before parsing requirements from the manifest, automatically default the |
| 25 // NPAPI plugin requirement based on whether it includes NPAPI plugins. | 24 // NPAPI plugin requirement based on whether it includes NPAPI plugins. |
| 26 const base::ListValue* list_value = NULL; | 25 const base::ListValue* list_value = NULL; |
| 27 npapi = manifest->GetList(keys::kPlugins, &list_value) && | 26 npapi = manifest->GetList(keys::kPlugins, &list_value) && |
| 28 !list_value->empty(); | 27 !list_value->empty(); |
| 29 } | 28 } |
| 30 | 29 |
| 31 RequirementsInfo::~RequirementsInfo() { | 30 RequirementsInfo::~RequirementsInfo() { |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 113 errors::kInvalidRequirement, iter.key()); | 112 errors::kInvalidRequirement, iter.key()); |
| 114 return false; | 113 return false; |
| 115 } | 114 } |
| 116 | 115 |
| 117 for (base::ListValue::const_iterator feature_iter = features->begin(); | 116 for (base::ListValue::const_iterator feature_iter = features->begin(); |
| 118 feature_iter != features->end(); ++feature_iter) { | 117 feature_iter != features->end(); ++feature_iter) { |
| 119 std::string feature; | 118 std::string feature; |
| 120 if ((*feature_iter)->GetAsString(&feature)) { | 119 if ((*feature_iter)->GetAsString(&feature)) { |
| 121 if (feature == "webgl") { | 120 if (feature == "webgl") { |
| 122 requirements->webgl = true; | 121 requirements->webgl = true; |
| 123 } else if (feature == "css3d") { | |
|
Marijn Kruisselbrink
2014/04/16 20:39:14
Removing this if entirely makes this a backwards i
danakj
2014/04/16 20:46:57
oh ok that was what I was attempting to do yes. i
danakj
2014/04/16 20:54:11
I'm trying to understand what the right thing to d
| |
| 124 requirements->css3d = true; | |
| 125 } else { | 122 } else { |
| 126 *error = ErrorUtils::FormatErrorMessageUTF16( | 123 *error = ErrorUtils::FormatErrorMessageUTF16( |
| 127 errors::kInvalidRequirement, iter.key()); | 124 errors::kInvalidRequirement, iter.key()); |
| 128 return false; | 125 return false; |
| 129 } | 126 } |
| 130 } | 127 } |
| 131 } | 128 } |
| 132 } else if (iter.key() == "window") { | 129 } else if (iter.key() == "window") { |
| 133 for (base::DictionaryValue::Iterator feature_iter(*requirement_value); | 130 for (base::DictionaryValue::Iterator feature_iter(*requirement_value); |
| 134 !feature_iter.IsAtEnd(); feature_iter.Advance()) { | 131 !feature_iter.IsAtEnd(); feature_iter.Advance()) { |
| (...skipping 15 matching lines...) Expand all Loading... | |
| 150 *error = base::ASCIIToUTF16(errors::kInvalidRequirements); | 147 *error = base::ASCIIToUTF16(errors::kInvalidRequirements); |
| 151 return false; | 148 return false; |
| 152 } | 149 } |
| 153 } | 150 } |
| 154 | 151 |
| 155 extension->SetManifestData(keys::kRequirements, requirements.release()); | 152 extension->SetManifestData(keys::kRequirements, requirements.release()); |
| 156 return true; | 153 return true; |
| 157 } | 154 } |
| 158 | 155 |
| 159 } // namespace extensions | 156 } // namespace extensions |
| OLD | NEW |