| 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 <string> | |
| 8 | |
| 9 #include "base/json/json_reader.h" | 7 #include "base/json/json_reader.h" |
| 10 #include "base/logging.h" | 8 #include "base/logging.h" |
| 11 #include "ui/base/resource/resource_bundle.h" | 9 #include "ui/base/resource/resource_bundle.h" |
| 12 | 10 |
| 13 namespace extensions { | 11 namespace extensions { |
| 14 | 12 |
| 15 JSONFeatureProviderSource::JSONFeatureProviderSource(const std::string& name) | 13 JSONFeatureProviderSource::JSONFeatureProviderSource(const std::string& name) |
| 16 : name_(name) { | 14 : name_(name) { |
| 17 } | 15 } |
| 18 | 16 |
| (...skipping 25 matching lines...) Expand all Loading... |
| 44 iter.Advance()) { | 42 iter.Advance()) { |
| 45 if (dictionary_.GetWithoutPathExpansion(iter.key(), NULL)) | 43 if (dictionary_.GetWithoutPathExpansion(iter.key(), NULL)) |
| 46 LOG(FATAL) << "Key " << iter.key() << " is defined in " << name_ | 44 LOG(FATAL) << "Key " << iter.key() << " is defined in " << name_ |
| 47 << " JSON feature files more than once."; | 45 << " JSON feature files more than once."; |
| 48 } | 46 } |
| 49 | 47 |
| 50 // Merge. | 48 // Merge. |
| 51 dictionary_.MergeDictionary(value_as_dict.get()); | 49 dictionary_.MergeDictionary(value_as_dict.get()); |
| 52 } | 50 } |
| 53 | 51 |
| 54 } // namespace | 52 } // namespace extensions |
| OLD | NEW |