| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 // Multiply-included file, no traditional include guard. | 5 // Multiply-included file, no traditional include guard. |
| 6 #include <string> | 6 #include <string> |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/values.h" | 9 #include "base/values.h" |
| 10 #include "content/public/common/common_param_traits.h" | 10 #include "content/public/common/common_param_traits.h" |
| 11 #include "content/public/common/page_state.h" | 11 #include "content/public/common/page_state.h" |
| 12 #include "content/shell/common/leak_detection_result.h" | 12 #include "content/shell/common/leak_detection_result.h" |
| 13 #include "content/shell/common/shell_test_configuration.h" | 13 #include "content/shell/common/shell_test_configuration.h" |
| 14 #include "ipc/ipc_message_macros.h" | 14 #include "ipc/ipc_message_macros.h" |
| 15 #include "ipc/ipc_platform_file.h" | 15 #include "ipc/ipc_platform_file.h" |
| 16 #include "third_party/skia/include/core/SkBitmap.h" | 16 #include "third_party/skia/include/core/SkBitmap.h" |
| 17 #include "ui/gfx/ipc/gfx_param_traits.h" | 17 #include "ui/gfx/ipc/gfx_param_traits.h" |
| 18 #include "ui/gfx/ipc/skia/gfx_skia_param_traits.h" |
| 18 | 19 |
| 19 #define IPC_MESSAGE_START ShellMsgStart | 20 #define IPC_MESSAGE_START ShellMsgStart |
| 20 | 21 |
| 21 IPC_STRUCT_TRAITS_BEGIN(content::ShellTestConfiguration) | 22 IPC_STRUCT_TRAITS_BEGIN(content::ShellTestConfiguration) |
| 22 IPC_STRUCT_TRAITS_MEMBER(current_working_directory) | 23 IPC_STRUCT_TRAITS_MEMBER(current_working_directory) |
| 23 IPC_STRUCT_TRAITS_MEMBER(temp_path) | 24 IPC_STRUCT_TRAITS_MEMBER(temp_path) |
| 24 IPC_STRUCT_TRAITS_MEMBER(test_url) | 25 IPC_STRUCT_TRAITS_MEMBER(test_url) |
| 25 IPC_STRUCT_TRAITS_MEMBER(enable_pixel_dumping) | 26 IPC_STRUCT_TRAITS_MEMBER(enable_pixel_dumping) |
| 26 IPC_STRUCT_TRAITS_MEMBER(allow_external_pages) | 27 IPC_STRUCT_TRAITS_MEMBER(allow_external_pages) |
| 27 IPC_STRUCT_TRAITS_MEMBER(expected_pixel_hash) | 28 IPC_STRUCT_TRAITS_MEMBER(expected_pixel_hash) |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 139 content::LeakDetectionResult /* result */) | 140 content::LeakDetectionResult /* result */) |
| 140 | 141 |
| 141 IPC_MESSAGE_ROUTED1(ShellViewHostMsg_SetBluetoothManualChooser, | 142 IPC_MESSAGE_ROUTED1(ShellViewHostMsg_SetBluetoothManualChooser, |
| 142 bool /* enable */) | 143 bool /* enable */) |
| 143 IPC_MESSAGE_ROUTED0(ShellViewHostMsg_GetBluetoothManualChooserEvents) | 144 IPC_MESSAGE_ROUTED0(ShellViewHostMsg_GetBluetoothManualChooserEvents) |
| 144 IPC_MESSAGE_ROUTED1(ShellViewMsg_ReplyBluetoothManualChooserEvents, | 145 IPC_MESSAGE_ROUTED1(ShellViewMsg_ReplyBluetoothManualChooserEvents, |
| 145 std::vector<std::string> /* events */) | 146 std::vector<std::string> /* events */) |
| 146 IPC_MESSAGE_ROUTED2(ShellViewHostMsg_SendBluetoothManualChooserEvent, | 147 IPC_MESSAGE_ROUTED2(ShellViewHostMsg_SendBluetoothManualChooserEvent, |
| 147 std::string /* event */, | 148 std::string /* event */, |
| 148 std::string /* argument */) | 149 std::string /* argument */) |
| OLD | NEW |