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 1099 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1347 l->append(")"); | 1348 l->append(")"); |
1348 } | 1349 } |
1349 | 1350 |
1350 void ParamTraits<ViewHostMsg_CreateWindow_Params>::Write(Message* m, | 1351 void ParamTraits<ViewHostMsg_CreateWindow_Params>::Write(Message* m, |
1351 const param_type& p) { | 1352 const param_type& p) { |
1352 WriteParam(m, p.opener_id); | 1353 WriteParam(m, p.opener_id); |
1353 WriteParam(m, p.user_gesture); | 1354 WriteParam(m, p.user_gesture); |
1354 WriteParam(m, p.window_container_type); | 1355 WriteParam(m, p.window_container_type); |
1355 WriteParam(m, p.session_storage_namespace_id); | 1356 WriteParam(m, p.session_storage_namespace_id); |
1356 WriteParam(m, p.frame_name); | 1357 WriteParam(m, p.frame_name); |
| 1358 WriteParam(m, p.opener_frame_id); |
| 1359 WriteParam(m, p.opener_url); |
| 1360 WriteParam(m, p.opener_security_origin); |
| 1361 WriteParam(m, p.target_url); |
1357 } | 1362 } |
1358 | 1363 |
1359 bool ParamTraits<ViewHostMsg_CreateWindow_Params>::Read(const Message* m, | 1364 bool ParamTraits<ViewHostMsg_CreateWindow_Params>::Read(const Message* m, |
1360 void** iter, | 1365 void** iter, |
1361 param_type* p) { | 1366 param_type* p) { |
1362 return | 1367 return |
1363 ReadParam(m, iter, &p->opener_id) && | 1368 ReadParam(m, iter, &p->opener_id) && |
1364 ReadParam(m, iter, &p->user_gesture) && | 1369 ReadParam(m, iter, &p->user_gesture) && |
1365 ReadParam(m, iter, &p->window_container_type) && | 1370 ReadParam(m, iter, &p->window_container_type) && |
1366 ReadParam(m, iter, &p->session_storage_namespace_id) && | 1371 ReadParam(m, iter, &p->session_storage_namespace_id) && |
1367 ReadParam(m, iter, &p->frame_name); | 1372 ReadParam(m, iter, &p->frame_name) && |
| 1373 ReadParam(m, iter, &p->opener_frame_id) && |
| 1374 ReadParam(m, iter, &p->opener_url) && |
| 1375 ReadParam(m, iter, &p->opener_security_origin) && |
| 1376 ReadParam(m, iter, &p->target_url); |
1368 } | 1377 } |
1369 | 1378 |
1370 void ParamTraits<ViewHostMsg_CreateWindow_Params>::Log(const param_type& p, | 1379 void ParamTraits<ViewHostMsg_CreateWindow_Params>::Log(const param_type& p, |
1371 std::string* l) { | 1380 std::string* l) { |
1372 l->append("("); | 1381 l->append("("); |
1373 LogParam(p.opener_id, l); | 1382 LogParam(p.opener_id, l); |
1374 l->append(", "); | 1383 l->append(", "); |
1375 LogParam(p.user_gesture, l); | 1384 LogParam(p.user_gesture, l); |
1376 l->append(", "); | 1385 l->append(", "); |
1377 LogParam(p.window_container_type, l); | 1386 LogParam(p.window_container_type, l); |
1378 l->append(", "); | 1387 l->append(", "); |
1379 LogParam(p.session_storage_namespace_id, l); | 1388 LogParam(p.session_storage_namespace_id, l); |
1380 l->append(", "); | 1389 l->append(", "); |
1381 LogParam(p.frame_name, l); | 1390 LogParam(p.frame_name, l); |
| 1391 l->append(", "); |
| 1392 LogParam(p.opener_frame_id, l); |
| 1393 l->append(", "); |
| 1394 LogParam(p.opener_url, l); |
| 1395 l->append(", "); |
| 1396 LogParam(p.opener_security_origin, l); |
| 1397 l->append(", "); |
| 1398 LogParam(p.target_url, l); |
1382 l->append(")"); | 1399 l->append(")"); |
1383 } | 1400 } |
1384 | 1401 |
1385 void ParamTraits<ViewHostMsg_RunFileChooser_Params>::Write( | 1402 void ParamTraits<ViewHostMsg_RunFileChooser_Params>::Write( |
1386 Message* m, | 1403 Message* m, |
1387 const param_type& p) { | 1404 const param_type& p) { |
1388 WriteParam(m, static_cast<int>(p.mode)); | 1405 WriteParam(m, static_cast<int>(p.mode)); |
1389 WriteParam(m, p.title); | 1406 WriteParam(m, p.title); |
1390 WriteParam(m, p.default_file_name); | 1407 WriteParam(m, p.default_file_name); |
1391 WriteParam(m, p.accept_types); | 1408 WriteParam(m, p.accept_types); |
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1610 const param_type& p, | 1627 const param_type& p, |
1611 std::string* l) { | 1628 std::string* l) { |
1612 l->append("("); | 1629 l->append("("); |
1613 LogParam(p.notification_type, l); | 1630 LogParam(p.notification_type, l); |
1614 l->append(", "); | 1631 l->append(", "); |
1615 LogParam(p.acc_obj, l); | 1632 LogParam(p.acc_obj, l); |
1616 l->append(")"); | 1633 l->append(")"); |
1617 } | 1634 } |
1618 | 1635 |
1619 } // namespace IPC | 1636 } // namespace IPC |
OLD | NEW |