OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 "ipc/ipc_message_utils.h" | 5 #include "ipc/ipc_message_utils.h" |
6 | 6 |
7 #include "base/file_path.h" | 7 #include "base/file_path.h" |
8 #include "base/json/json_writer.h" | 8 #include "base/json/json_writer.h" |
9 #include "base/nullable_string16.h" | 9 #include "base/nullable_string16.h" |
10 #include "base/scoped_ptr.h" | 10 #include "base/scoped_ptr.h" |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
42 value->GetAsBoolean(&val); | 42 value->GetAsBoolean(&val); |
43 WriteParam(m, val); | 43 WriteParam(m, val); |
44 break; | 44 break; |
45 } | 45 } |
46 case Value::TYPE_INTEGER: { | 46 case Value::TYPE_INTEGER: { |
47 int val; | 47 int val; |
48 value->GetAsInteger(&val); | 48 value->GetAsInteger(&val); |
49 WriteParam(m, val); | 49 WriteParam(m, val); |
50 break; | 50 break; |
51 } | 51 } |
52 case Value::TYPE_REAL: { | 52 case Value::TYPE_DOUBLE: { |
53 double val; | 53 double val; |
54 value->GetAsReal(&val); | 54 value->GetAsDouble(&val); |
55 WriteParam(m, val); | 55 WriteParam(m, val); |
56 break; | 56 break; |
57 } | 57 } |
58 case Value::TYPE_STRING: { | 58 case Value::TYPE_STRING: { |
59 std::string val; | 59 std::string val; |
60 value->GetAsString(&val); | 60 value->GetAsString(&val); |
61 WriteParam(m, val); | 61 WriteParam(m, val); |
62 break; | 62 break; |
63 } | 63 } |
64 case Value::TYPE_BINARY: { | 64 case Value::TYPE_BINARY: { |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
159 *value = Value::CreateBooleanValue(val); | 159 *value = Value::CreateBooleanValue(val); |
160 break; | 160 break; |
161 } | 161 } |
162 case Value::TYPE_INTEGER: { | 162 case Value::TYPE_INTEGER: { |
163 int val; | 163 int val; |
164 if (!ReadParam(m, iter, &val)) | 164 if (!ReadParam(m, iter, &val)) |
165 return false; | 165 return false; |
166 *value = Value::CreateIntegerValue(val); | 166 *value = Value::CreateIntegerValue(val); |
167 break; | 167 break; |
168 } | 168 } |
169 case Value::TYPE_REAL: { | 169 case Value::TYPE_DOUBLE: { |
170 double val; | 170 double val; |
171 if (!ReadParam(m, iter, &val)) | 171 if (!ReadParam(m, iter, &val)) |
172 return false; | 172 return false; |
173 *value = Value::CreateRealValue(val); | 173 *value = Value::CreateDoubleValue(val); |
174 break; | 174 break; |
175 } | 175 } |
176 case Value::TYPE_STRING: { | 176 case Value::TYPE_STRING: { |
177 std::string val; | 177 std::string val; |
178 if (!ReadParam(m, iter, &val)) | 178 if (!ReadParam(m, iter, &val)) |
179 return false; | 179 return false; |
180 *value = Value::CreateStringValue(val); | 180 *value = Value::CreateStringValue(val); |
181 break; | 181 break; |
182 } | 182 } |
183 case Value::TYPE_BINARY: { | 183 case Value::TYPE_BINARY: { |
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
463 ReadParam(m, iter, &r->flags) && | 463 ReadParam(m, iter, &r->flags) && |
464 ReadParam(m, iter, &r->sent) && | 464 ReadParam(m, iter, &r->sent) && |
465 ReadParam(m, iter, &r->receive) && | 465 ReadParam(m, iter, &r->receive) && |
466 ReadParam(m, iter, &r->dispatch) && | 466 ReadParam(m, iter, &r->dispatch) && |
467 ReadParam(m, iter, &r->params); | 467 ReadParam(m, iter, &r->params); |
468 r->type = static_cast<uint16>(type); | 468 r->type = static_cast<uint16>(type); |
469 return result; | 469 return result; |
470 } | 470 } |
471 | 471 |
472 } // namespace IPC | 472 } // namespace IPC |
OLD | NEW |