| OLD | NEW |
| 1 // Copyright (c) 2011 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 // Most of this code is copied from various classes in | 5 // Most of this code is copied from various classes in |
| 6 // src/chrome/browser/policy. In particular, look at | 6 // src/chrome/browser/policy. In particular, look at |
| 7 // | 7 // |
| 8 // file_based_policy_loader.{h,cc} | 8 // file_based_policy_loader.{h,cc} |
| 9 // config_dir_policy_provider.{h,cc} | 9 // config_dir_policy_provider.{h,cc} |
| 10 // | 10 // |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 174 JSONFileValueSerializer deserializer(*config_file_iter); | 174 JSONFileValueSerializer deserializer(*config_file_iter); |
| 175 int error_code = 0; | 175 int error_code = 0; |
| 176 std::string error_msg; | 176 std::string error_msg; |
| 177 scoped_ptr<Value> value( | 177 scoped_ptr<Value> value( |
| 178 deserializer.Deserialize(&error_code, &error_msg)); | 178 deserializer.Deserialize(&error_code, &error_msg)); |
| 179 if (!value.get()) { | 179 if (!value.get()) { |
| 180 LOG(WARNING) << "Failed to read configuration file " | 180 LOG(WARNING) << "Failed to read configuration file " |
| 181 << config_file_iter->value() << ": " << error_msg; | 181 << config_file_iter->value() << ": " << error_msg; |
| 182 continue; | 182 continue; |
| 183 } | 183 } |
| 184 if (!value->IsType(Value::TYPE_DICTIONARY)) { | 184 if (!value->IsDictionary()) { |
| 185 LOG(WARNING) << "Expected JSON dictionary in configuration file " | 185 LOG(WARNING) << "Expected JSON dictionary in configuration file " |
| 186 << config_file_iter->value(); | 186 << config_file_iter->value(); |
| 187 continue; | 187 continue; |
| 188 } | 188 } |
| 189 policy->MergeDictionary(static_cast<DictionaryValue*>(value.get())); | 189 policy->MergeDictionary(static_cast<DictionaryValue*>(value.get())); |
| 190 } | 190 } |
| 191 | 191 |
| 192 return policy; | 192 return policy; |
| 193 } | 193 } |
| 194 | 194 |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 266 base::WeakPtrFactory<NatPolicyLinux> weak_factory_; | 266 base::WeakPtrFactory<NatPolicyLinux> weak_factory_; |
| 267 }; | 267 }; |
| 268 | 268 |
| 269 NatPolicy* NatPolicy::Create(base::MessageLoopProxy* message_loop_proxy) { | 269 NatPolicy* NatPolicy::Create(base::MessageLoopProxy* message_loop_proxy) { |
| 270 FilePath policy_dir(kPolicyDir); | 270 FilePath policy_dir(kPolicyDir); |
| 271 return new NatPolicyLinux(message_loop_proxy, policy_dir); | 271 return new NatPolicyLinux(message_loop_proxy, policy_dir); |
| 272 } | 272 } |
| 273 | 273 |
| 274 } // namespace policy_hack | 274 } // namespace policy_hack |
| 275 } // namespace remoting | 275 } // namespace remoting |
| OLD | NEW |