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 "chrome/common/render_messages_params.h" | 5 #include "chrome/common/render_messages_params.h" |
6 | 6 |
7 #include "chrome/common/navigation_gesture.h" | 7 #include "chrome/common/navigation_gesture.h" |
8 #include "chrome/common/common_param_traits.h" | 8 #include "chrome/common/common_param_traits.h" |
9 #include "chrome/common/render_messages.h" | 9 #include "chrome/common/render_messages.h" |
10 #include "net/base/upload_data.h" | 10 #include "net/base/upload_data.h" |
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
227 session_storage_namespace_id(0) { | 227 session_storage_namespace_id(0) { |
228 } | 228 } |
229 | 229 |
230 ViewMsg_New_Params::~ViewMsg_New_Params() { | 230 ViewMsg_New_Params::~ViewMsg_New_Params() { |
231 } | 231 } |
232 | 232 |
233 ViewHostMsg_CreateWindow_Params::ViewHostMsg_CreateWindow_Params() | 233 ViewHostMsg_CreateWindow_Params::ViewHostMsg_CreateWindow_Params() |
234 : opener_id(0), | 234 : opener_id(0), |
235 user_gesture(false), | 235 user_gesture(false), |
236 window_container_type(WINDOW_CONTAINER_TYPE_NORMAL), | 236 window_container_type(WINDOW_CONTAINER_TYPE_NORMAL), |
237 session_storage_namespace_id(0) { | 237 session_storage_namespace_id(0), |
| 238 opener_frame_id(0) { |
238 } | 239 } |
239 | 240 |
240 ViewHostMsg_CreateWindow_Params::~ViewHostMsg_CreateWindow_Params() { | 241 ViewHostMsg_CreateWindow_Params::~ViewHostMsg_CreateWindow_Params() { |
241 } | 242 } |
242 | 243 |
243 ViewHostMsg_RunFileChooser_Params::ViewHostMsg_RunFileChooser_Params() | 244 ViewHostMsg_RunFileChooser_Params::ViewHostMsg_RunFileChooser_Params() |
244 : mode(Open) { | 245 : mode(Open) { |
245 } | 246 } |
246 | 247 |
247 ViewHostMsg_RunFileChooser_Params::~ViewHostMsg_RunFileChooser_Params() { | 248 ViewHostMsg_RunFileChooser_Params::~ViewHostMsg_RunFileChooser_Params() { |
(...skipping 1095 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1343 l->append(")"); | 1344 l->append(")"); |
1344 } | 1345 } |
1345 | 1346 |
1346 void ParamTraits<ViewHostMsg_CreateWindow_Params>::Write(Message* m, | 1347 void ParamTraits<ViewHostMsg_CreateWindow_Params>::Write(Message* m, |
1347 const param_type& p) { | 1348 const param_type& p) { |
1348 WriteParam(m, p.opener_id); | 1349 WriteParam(m, p.opener_id); |
1349 WriteParam(m, p.user_gesture); | 1350 WriteParam(m, p.user_gesture); |
1350 WriteParam(m, p.window_container_type); | 1351 WriteParam(m, p.window_container_type); |
1351 WriteParam(m, p.session_storage_namespace_id); | 1352 WriteParam(m, p.session_storage_namespace_id); |
1352 WriteParam(m, p.frame_name); | 1353 WriteParam(m, p.frame_name); |
| 1354 WriteParam(m, p.opener_frame_id); |
| 1355 WriteParam(m, p.opener_url); |
| 1356 WriteParam(m, p.target_url); |
1353 } | 1357 } |
1354 | 1358 |
1355 bool ParamTraits<ViewHostMsg_CreateWindow_Params>::Read(const Message* m, | 1359 bool ParamTraits<ViewHostMsg_CreateWindow_Params>::Read(const Message* m, |
1356 void** iter, | 1360 void** iter, |
1357 param_type* p) { | 1361 param_type* p) { |
1358 return | 1362 return |
1359 ReadParam(m, iter, &p->opener_id) && | 1363 ReadParam(m, iter, &p->opener_id) && |
1360 ReadParam(m, iter, &p->user_gesture) && | 1364 ReadParam(m, iter, &p->user_gesture) && |
1361 ReadParam(m, iter, &p->window_container_type) && | 1365 ReadParam(m, iter, &p->window_container_type) && |
1362 ReadParam(m, iter, &p->session_storage_namespace_id) && | 1366 ReadParam(m, iter, &p->session_storage_namespace_id) && |
1363 ReadParam(m, iter, &p->frame_name); | 1367 ReadParam(m, iter, &p->frame_name) && |
| 1368 ReadParam(m, iter, &p->opener_frame_id) && |
| 1369 ReadParam(m, iter, &p->opener_url) && |
| 1370 ReadParam(m, iter, &p->target_url); |
1364 } | 1371 } |
1365 | 1372 |
1366 void ParamTraits<ViewHostMsg_CreateWindow_Params>::Log(const param_type& p, | 1373 void ParamTraits<ViewHostMsg_CreateWindow_Params>::Log(const param_type& p, |
1367 std::string* l) { | 1374 std::string* l) { |
1368 l->append("("); | 1375 l->append("("); |
1369 LogParam(p.opener_id, l); | 1376 LogParam(p.opener_id, l); |
1370 l->append(", "); | 1377 l->append(", "); |
1371 LogParam(p.user_gesture, l); | 1378 LogParam(p.user_gesture, l); |
1372 l->append(", "); | 1379 l->append(", "); |
1373 LogParam(p.window_container_type, l); | 1380 LogParam(p.window_container_type, l); |
1374 l->append(", "); | 1381 l->append(", "); |
1375 LogParam(p.session_storage_namespace_id, l); | 1382 LogParam(p.session_storage_namespace_id, l); |
1376 l->append(", "); | 1383 l->append(", "); |
1377 LogParam(p.frame_name, l); | 1384 LogParam(p.frame_name, l); |
| 1385 l->append(", "); |
| 1386 LogParam(p.opener_frame_id, l); |
| 1387 l->append(", "); |
| 1388 LogParam(p.opener_url, l); |
| 1389 l->append(", "); |
| 1390 LogParam(p.target_url, l); |
1378 l->append(")"); | 1391 l->append(")"); |
1379 } | 1392 } |
1380 | 1393 |
1381 void ParamTraits<ViewHostMsg_RunFileChooser_Params>::Write( | 1394 void ParamTraits<ViewHostMsg_RunFileChooser_Params>::Write( |
1382 Message* m, | 1395 Message* m, |
1383 const param_type& p) { | 1396 const param_type& p) { |
1384 WriteParam(m, static_cast<int>(p.mode)); | 1397 WriteParam(m, static_cast<int>(p.mode)); |
1385 WriteParam(m, p.title); | 1398 WriteParam(m, p.title); |
1386 WriteParam(m, p.default_file_name); | 1399 WriteParam(m, p.default_file_name); |
1387 WriteParam(m, p.accept_types); | 1400 WriteParam(m, p.accept_types); |
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1606 const param_type& p, | 1619 const param_type& p, |
1607 std::string* l) { | 1620 std::string* l) { |
1608 l->append("("); | 1621 l->append("("); |
1609 LogParam(p.notification_type, l); | 1622 LogParam(p.notification_type, l); |
1610 l->append(", "); | 1623 l->append(", "); |
1611 LogParam(p.acc_obj, l); | 1624 LogParam(p.acc_obj, l); |
1612 l->append(")"); | 1625 l->append(")"); |
1613 } | 1626 } |
1614 | 1627 |
1615 } // namespace IPC | 1628 } // namespace IPC |
OLD | NEW |