Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(130)

Side by Side Diff: chrome/renderer/render_view.cc

Issue 6488010: Propagate the remote socket address to URLRequest and to ViewHostMsg_FrameNavigate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/renderer/render_view.h" 5 #include "chrome/renderer/render_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 1644 matching lines...) Expand 10 before | Expand all | Expand 10 after
1655 1655
1656 NavigationState* navigation_state = NavigationState::FromDataSource(ds); 1656 NavigationState* navigation_state = NavigationState::FromDataSource(ds);
1657 DCHECK(navigation_state); 1657 DCHECK(navigation_state);
1658 1658
1659 ViewHostMsg_FrameNavigate_Params params; 1659 ViewHostMsg_FrameNavigate_Params params;
1660 params.http_status_code = response.httpStatusCode(); 1660 params.http_status_code = response.httpStatusCode();
1661 params.is_post = false; 1661 params.is_post = false;
1662 params.page_id = page_id_; 1662 params.page_id = page_id_;
1663 params.frame_id = frame->identifier(); 1663 params.frame_id = frame->identifier();
1664 params.is_content_filtered = response.isContentFiltered(); 1664 params.is_content_filtered = response.isContentFiltered();
1665 params.socket_address = response.socketAddress().utf8();
1665 params.was_within_same_page = navigation_state->was_within_same_page(); 1666 params.was_within_same_page = navigation_state->was_within_same_page();
1666 if (!navigation_state->security_info().empty()) { 1667 if (!navigation_state->security_info().empty()) {
1667 // SSL state specified in the request takes precedence over the one in the 1668 // SSL state specified in the request takes precedence over the one in the
1668 // response. 1669 // response.
1669 // So far this is only intended for error pages that are not expected to be 1670 // So far this is only intended for error pages that are not expected to be
1670 // over ssl, so we should not get any clash. 1671 // over ssl, so we should not get any clash.
1671 DCHECK(response.securityInfo().isEmpty()); 1672 DCHECK(response.securityInfo().isEmpty());
1672 params.security_info = navigation_state->security_info(); 1673 params.security_info = navigation_state->security_info();
1673 } else { 1674 } else {
1674 params.security_info = response.securityInfo(); 1675 params.security_info = response.securityInfo();
(...skipping 4106 matching lines...) Expand 10 before | Expand all | Expand 10 after
5781 } 5782 }
5782 } 5783 }
5783 5784
5784 void RenderView::OnContextMenuClosed( 5785 void RenderView::OnContextMenuClosed(
5785 const webkit_glue::CustomContextMenuContext& custom_context) { 5786 const webkit_glue::CustomContextMenuContext& custom_context) {
5786 if (custom_context.is_pepper_menu) 5787 if (custom_context.is_pepper_menu)
5787 pepper_delegate_.OnContextMenuClosed(custom_context); 5788 pepper_delegate_.OnContextMenuClosed(custom_context);
5788 else 5789 else
5789 context_menu_node_.reset(); 5790 context_menu_node_.reset();
5790 } 5791 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698