OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/browser/extensions/external_provider_impl.h" | 5 #include "chrome/browser/extensions/external_provider_impl.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
116 } | 116 } |
117 | 117 |
118 if (!i.value().GetAsDictionary(&extension)) { | 118 if (!i.value().GetAsDictionary(&extension)) { |
119 LOG(WARNING) << "Malformed extension dictionary: key " | 119 LOG(WARNING) << "Malformed extension dictionary: key " |
120 << extension_id.c_str() | 120 << extension_id.c_str() |
121 << " has a value that is not a dictionary."; | 121 << " has a value that is not a dictionary."; |
122 continue; | 122 continue; |
123 } | 123 } |
124 | 124 |
125 base::FilePath::StringType external_crx; | 125 base::FilePath::StringType external_crx; |
126 const Value* external_version_value = NULL; | 126 const base::Value* external_version_value = NULL; |
127 std::string external_version; | 127 std::string external_version; |
128 std::string external_update_url; | 128 std::string external_update_url; |
129 | 129 |
130 bool has_external_crx = extension->GetString(kExternalCrx, &external_crx); | 130 bool has_external_crx = extension->GetString(kExternalCrx, &external_crx); |
131 | 131 |
132 bool has_external_version = false; | 132 bool has_external_version = false; |
133 if (extension->Get(kExternalVersion, &external_version_value)) { | 133 if (extension->Get(kExternalVersion, &external_version_value)) { |
134 if (external_version_value->IsType(Value::TYPE_STRING)) { | 134 if (external_version_value->IsType(base::Value::TYPE_STRING)) { |
135 external_version_value->GetAsString(&external_version); | 135 external_version_value->GetAsString(&external_version); |
136 has_external_version = true; | 136 has_external_version = true; |
137 } else { | 137 } else { |
138 LOG(WARNING) << "Malformed extension dictionary for extension: " | 138 LOG(WARNING) << "Malformed extension dictionary for extension: " |
139 << extension_id.c_str() << ". " << kExternalVersion | 139 << extension_id.c_str() << ". " << kExternalVersion |
140 << " value must be a string."; | 140 << " value must be a string."; |
141 continue; | 141 continue; |
142 } | 142 } |
143 } | 143 } |
144 | 144 |
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
521 service, | 521 service, |
522 new ExternalComponentLoader(profile), | 522 new ExternalComponentLoader(profile), |
523 profile, | 523 profile, |
524 Manifest::INVALID_LOCATION, | 524 Manifest::INVALID_LOCATION, |
525 Manifest::EXTERNAL_COMPONENT, | 525 Manifest::EXTERNAL_COMPONENT, |
526 Extension::FROM_WEBSTORE | Extension::WAS_INSTALLED_BY_DEFAULT))); | 526 Extension::FROM_WEBSTORE | Extension::WAS_INSTALLED_BY_DEFAULT))); |
527 } | 527 } |
528 } | 528 } |
529 | 529 |
530 } // namespace extensions | 530 } // namespace extensions |
OLD | NEW |