| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 // Message definition file, included multiple times, hence no include guard. | 5 // Message definition file, included multiple times, hence no include guard. |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/strings/string16.h" | 10 #include "base/strings/string16.h" |
| 11 #include "content/public/common/common_param_traits.h" |
| 12 #include "content/public/common/common_param_traits_macros.h" |
| 11 #include "ipc/ipc_message_macros.h" | 13 #include "ipc/ipc_message_macros.h" |
| 12 #include "ipc/ipc_message_utils.h" | 14 #include "ipc/ipc_message_utils.h" |
| 13 | 15 |
| 14 #define IPC_MESSAGE_START SafeJsonParserMsgStart | 16 #define IPC_MESSAGE_START SafeJsonParserMsgStart |
| 15 | 17 |
| 16 //------------------------------------------------------------------------------ | 18 //------------------------------------------------------------------------------ |
| 17 // Process messages: | 19 // Process messages: |
| 18 // This is a message from the browser to the utility process telling it to parse | 20 // This is a message from the browser to the utility process telling it to parse |
| 19 // a JSON string into a Value object. | 21 // a JSON string into a Value object. |
| 20 IPC_MESSAGE_CONTROL1(SafeJsonParserMsg_ParseJSON, | 22 IPC_MESSAGE_CONTROL1(SafeJsonParserMsg_ParseJSON, |
| 21 std::string /* JSON to parse */) | 23 std::string /* JSON to parse */) |
| 22 | 24 |
| 23 //------------------------------------------------------------------------------ | 25 //------------------------------------------------------------------------------ |
| 24 // Host messages: Reply when the utility process successfully parsed a JSON | 26 // Host messages: Reply when the utility process successfully parsed a JSON |
| 25 // string. | 27 // string. |
| 26 // | 28 // |
| 27 // WARNING: The result can be of any Value subclass type, but we can't easily | 29 // WARNING: The result can be of any Value subclass type, but we can't easily |
| 28 // pass indeterminate value types by const object reference with our IPC macros, | 30 // pass indeterminate value types by const object reference with our IPC macros, |
| 29 // so we put the result Value into a ListValue. Handlers should examine the | 31 // so we put the result Value into a ListValue. Handlers should examine the |
| 30 // first (and only) element of the ListValue for the actual result. | 32 // first (and only) element of the ListValue for the actual result. |
| 31 IPC_MESSAGE_CONTROL1(SafeJsonParserHostMsg_ParseJSON_Succeeded, base::ListValue) | 33 IPC_MESSAGE_CONTROL1(SafeJsonParserHostMsg_ParseJSON_Succeeded, base::ListValue) |
| 32 | 34 |
| 33 // Reply when the utility process failed in parsing a JSON string. | 35 // Reply when the utility process failed in parsing a JSON string. |
| 34 IPC_MESSAGE_CONTROL1(SafeJsonParserHostMsg_ParseJSON_Failed, | 36 IPC_MESSAGE_CONTROL1(SafeJsonParserHostMsg_ParseJSON_Failed, |
| 35 std::string /* error message, if any*/) | 37 std::string /* error message, if any*/) |
| OLD | NEW |