OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "remoting/host/json_host_config.h" | 5 #include "remoting/host/json_host_config.h" |
6 | 6 |
7 #include "base/file_util.h" | 7 #include "base/file_util.h" |
8 #include "base/json/json_reader.h" | 8 #include "base/json/json_reader.h" |
9 #include "base/json/json_writer.h" | 9 #include "base/json/json_writer.h" |
10 #include "base/message_loop_proxy.h" | 10 #include "base/message_loop_proxy.h" |
11 #include "base/task.h" | 11 #include "base/task.h" |
12 #include "base/values.h" | 12 #include "base/values.h" |
13 | 13 |
14 namespace remoting { | 14 namespace remoting { |
15 | 15 |
16 JsonHostConfig::JsonHostConfig( | 16 JsonHostConfig::JsonHostConfig( |
17 const FilePath& filename, | 17 const FilePath& filename, |
18 base::MessageLoopProxy* file_message_loop_proxy) | 18 base::MessageLoopProxy* file_message_loop_proxy) |
19 : filename_(filename), | 19 : filename_(filename), |
| 20 values_(new DictionaryValue()), |
20 message_loop_proxy_(file_message_loop_proxy) { | 21 message_loop_proxy_(file_message_loop_proxy) { |
21 } | 22 } |
22 | 23 |
23 bool JsonHostConfig::Read() { | 24 bool JsonHostConfig::Read() { |
24 // TODO(sergeyu): Implement better error handling here. | 25 // TODO(sergeyu): Implement better error handling here. |
25 std::string file_content; | 26 std::string file_content; |
26 if (!file_util::ReadFileToString(filename_, &file_content)) { | 27 if (!file_util::ReadFileToString(filename_, &file_content)) { |
27 return false; | 28 return false; |
28 } | 29 } |
29 | 30 |
(...skipping 44 matching lines...) Loading... |
74 | 75 |
75 void JsonHostConfig::DoWrite() { | 76 void JsonHostConfig::DoWrite() { |
76 std::string file_content; | 77 std::string file_content; |
77 base::JSONWriter::Write(values_.get(), true, &file_content); | 78 base::JSONWriter::Write(values_.get(), true, &file_content); |
78 AutoLock auto_lock(lock_); | 79 AutoLock auto_lock(lock_); |
79 // TODO(sergeyu): Move ImportantFileWriter to base and use it here. | 80 // TODO(sergeyu): Move ImportantFileWriter to base and use it here. |
80 file_util::WriteFile(filename_, file_content.c_str(), file_content.size()); | 81 file_util::WriteFile(filename_, file_content.c_str(), file_content.size()); |
81 } | 82 } |
82 | 83 |
83 } // namespace remoting | 84 } // namespace remoting |
OLD | NEW |