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/features/json_feature_provider_source.h" | 5 #include "extensions/common/features/json_feature_provider_source.h" |
6 | 6 |
7 #include "base/json/json_reader.h" | 7 #include "base/json/json_reader.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "ui/base/resource/resource_bundle.h" | 9 #include "ui/base/resource/resource_bundle.h" |
10 | 10 |
(...skipping 22 matching lines...) Expand all Loading... |
33 value_as_dict.reset(static_cast<base::DictionaryValue*>(value.release())); | 33 value_as_dict.reset(static_cast<base::DictionaryValue*>(value.release())); |
34 } else { | 34 } else { |
35 // There was some error loading the features file. | 35 // There was some error loading the features file. |
36 // http://crbug.com/176381 | 36 // http://crbug.com/176381 |
37 value_as_dict.reset(new base::DictionaryValue()); | 37 value_as_dict.reset(new base::DictionaryValue()); |
38 } | 38 } |
39 | 39 |
40 // Ensure there are no key collisions. | 40 // Ensure there are no key collisions. |
41 for (base::DictionaryValue::Iterator iter(*value_as_dict); !iter.IsAtEnd(); | 41 for (base::DictionaryValue::Iterator iter(*value_as_dict); !iter.IsAtEnd(); |
42 iter.Advance()) { | 42 iter.Advance()) { |
43 if (dictionary_.GetWithoutPathExpansion(iter.key(), NULL)) | 43 if (dictionary_.GetWithoutPathExpansion(iter.key(), nullptr)) |
44 LOG(FATAL) << "Key " << iter.key() << " is defined in " << name_ | 44 LOG(FATAL) << "Key " << iter.key() << " is defined in " << name_ |
45 << " JSON feature files more than once."; | 45 << " JSON feature files more than once."; |
46 } | 46 } |
47 | 47 |
48 // Merge. | 48 // Merge. |
49 dictionary_.MergeDictionary(value_as_dict.get()); | 49 dictionary_.MergeDictionary(value_as_dict.get()); |
50 } | 50 } |
51 | 51 |
52 } // namespace extensions | 52 } // namespace extensions |
OLD | NEW |