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

Side by Side Diff: chrome/browser/policy/config_dir_policy_provider.cc

Issue 7661009: base: Add Is* functions to Value class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix nat_policy.cc Created 9 years, 4 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/policy/config_dir_policy_provider.h" 5 #include "chrome/browser/policy/config_dir_policy_provider.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/values.h" 10 #include "base/values.h"
11 #include "content/common/json_value_serializer.h" 11 #include "content/common/json_value_serializer.h"
(...skipping 20 matching lines...) Expand all
32 config_file_iter != files.end(); ++config_file_iter) { 32 config_file_iter != files.end(); ++config_file_iter) {
33 JSONFileValueSerializer deserializer(*config_file_iter); 33 JSONFileValueSerializer deserializer(*config_file_iter);
34 int error_code = 0; 34 int error_code = 0;
35 std::string error_msg; 35 std::string error_msg;
36 scoped_ptr<Value> value(deserializer.Deserialize(&error_code, &error_msg)); 36 scoped_ptr<Value> value(deserializer.Deserialize(&error_code, &error_msg));
37 if (!value.get()) { 37 if (!value.get()) {
38 LOG(WARNING) << "Failed to read configuration file " 38 LOG(WARNING) << "Failed to read configuration file "
39 << config_file_iter->value() << ": " << error_msg; 39 << config_file_iter->value() << ": " << error_msg;
40 continue; 40 continue;
41 } 41 }
42 if (!value->IsType(Value::TYPE_DICTIONARY)) { 42 if (!value->IsDictionary()) {
43 LOG(WARNING) << "Expected JSON dictionary in configuration file " 43 LOG(WARNING) << "Expected JSON dictionary in configuration file "
44 << config_file_iter->value(); 44 << config_file_iter->value();
45 continue; 45 continue;
46 } 46 }
47 policy->MergeDictionary(static_cast<DictionaryValue*>(value.get())); 47 policy->MergeDictionary(static_cast<DictionaryValue*>(value.get()));
48 } 48 }
49 49
50 return policy; 50 return policy;
51 } 51 }
52 52
(...skipping 25 matching lines...) Expand all
78 78
79 ConfigDirPolicyProvider::ConfigDirPolicyProvider( 79 ConfigDirPolicyProvider::ConfigDirPolicyProvider(
80 const ConfigurationPolicyProvider::PolicyDefinitionList* policy_list, 80 const ConfigurationPolicyProvider::PolicyDefinitionList* policy_list,
81 const FilePath& config_dir) 81 const FilePath& config_dir)
82 : FileBasedPolicyProvider( 82 : FileBasedPolicyProvider(
83 policy_list, 83 policy_list,
84 new ConfigDirPolicyProviderDelegate(config_dir)) { 84 new ConfigDirPolicyProviderDelegate(config_dir)) {
85 } 85 }
86 86
87 } // namespace policy 87 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698