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 "chrome/browser/extensions/extension_management_internal.h" | 5 #include "chrome/browser/extensions/extension_management_internal.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/values.h" | 8 #include "base/values.h" |
9 #include "base/version.h" | 9 #include "base/version.h" |
10 #include "chrome/browser/extensions/extension_management_constants.h" | 10 #include "chrome/browser/extensions/extension_management_constants.h" |
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
129 permissions_to_merge_from, permissions_parsed, &blocked_permissions); | 129 permissions_to_merge_from, permissions_parsed, &blocked_permissions); |
130 } | 130 } |
131 | 131 |
132 // Parses the minimum version settings. | 132 // Parses the minimum version settings. |
133 std::string minimum_version_required_str; | 133 std::string minimum_version_required_str; |
134 if (scope == SCOPE_INDIVIDUAL && | 134 if (scope == SCOPE_INDIVIDUAL && |
135 dict->GetStringWithoutPathExpansion( | 135 dict->GetStringWithoutPathExpansion( |
136 schema_constants::kMinimumVersionRequired, | 136 schema_constants::kMinimumVersionRequired, |
137 &minimum_version_required_str)) { | 137 &minimum_version_required_str)) { |
138 scoped_ptr<base::Version> version( | 138 scoped_ptr<base::Version> version( |
139 new Version(minimum_version_required_str)); | 139 new base::Version(minimum_version_required_str)); |
140 // We accept a general version string here. Note that count of components in | 140 // We accept a general version string here. Note that count of components in |
141 // version string of extensions is limited to 4. | 141 // version string of extensions is limited to 4. |
142 if (!version->IsValid()) | 142 if (!version->IsValid()) |
143 LOG(WARNING) << kMalformedPreferenceWarning; | 143 LOG(WARNING) << kMalformedPreferenceWarning; |
144 else | 144 else |
145 minimum_version_required = version.Pass(); | 145 minimum_version_required = version.Pass(); |
146 } | 146 } |
147 | 147 |
148 return true; | 148 return true; |
149 } | 149 } |
(...skipping 14 matching lines...) Expand all Loading... |
164 void GlobalSettings::Reset() { | 164 void GlobalSettings::Reset() { |
165 has_restricted_install_sources = false; | 165 has_restricted_install_sources = false; |
166 install_sources.ClearPatterns(); | 166 install_sources.ClearPatterns(); |
167 has_restricted_allowed_types = false; | 167 has_restricted_allowed_types = false; |
168 allowed_types.clear(); | 168 allowed_types.clear(); |
169 } | 169 } |
170 | 170 |
171 } // namespace internal | 171 } // namespace internal |
172 | 172 |
173 } // namespace extensions | 173 } // namespace extensions |
OLD | NEW |