Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(187)

Side by Side Diff: extensions/common/features/json_feature_provider_source.cc

Issue 278013002: Clean-up coding style (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove duplicate include from the .cc Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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
OLDNEW
« no previous file with comments | « extensions/common/features/json_feature_provider_source.h ('k') | extensions/common/features/manifest_feature.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698