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

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: propagate GetPeerAddressErrors, and sync 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 1609 matching lines...) Expand 10 before | Expand all | Expand 10 after
1620 1620
1621 NavigationState* navigation_state = NavigationState::FromDataSource(ds); 1621 NavigationState* navigation_state = NavigationState::FromDataSource(ds);
1622 DCHECK(navigation_state); 1622 DCHECK(navigation_state);
1623 1623
1624 ViewHostMsg_FrameNavigate_Params params; 1624 ViewHostMsg_FrameNavigate_Params params;
1625 params.http_status_code = response.httpStatusCode(); 1625 params.http_status_code = response.httpStatusCode();
1626 params.is_post = false; 1626 params.is_post = false;
1627 params.page_id = page_id_; 1627 params.page_id = page_id_;
1628 params.frame_id = frame->identifier(); 1628 params.frame_id = frame->identifier();
1629 params.is_content_filtered = response.isContentFiltered(); 1629 params.is_content_filtered = response.isContentFiltered();
1630 params.socket_address = response.socketAddress().utf8();
1630 params.was_within_same_page = navigation_state->was_within_same_page(); 1631 params.was_within_same_page = navigation_state->was_within_same_page();
1631 if (!navigation_state->security_info().empty()) { 1632 if (!navigation_state->security_info().empty()) {
1632 // SSL state specified in the request takes precedence over the one in the 1633 // SSL state specified in the request takes precedence over the one in the
1633 // response. 1634 // response.
1634 // So far this is only intended for error pages that are not expected to be 1635 // So far this is only intended for error pages that are not expected to be
1635 // over ssl, so we should not get any clash. 1636 // over ssl, so we should not get any clash.
1636 DCHECK(response.securityInfo().isEmpty()); 1637 DCHECK(response.securityInfo().isEmpty());
1637 params.security_info = navigation_state->security_info(); 1638 params.security_info = navigation_state->security_info();
1638 } else { 1639 } else {
1639 params.security_info = response.securityInfo(); 1640 params.security_info = response.securityInfo();
(...skipping 4020 matching lines...) Expand 10 before | Expand all | Expand 10 after
5660 } 5661 }
5661 } 5662 }
5662 5663
5663 void RenderView::OnContextMenuClosed( 5664 void RenderView::OnContextMenuClosed(
5664 const webkit_glue::CustomContextMenuContext& custom_context) { 5665 const webkit_glue::CustomContextMenuContext& custom_context) {
5665 if (custom_context.is_pepper_menu) 5666 if (custom_context.is_pepper_menu)
5666 pepper_delegate_.OnContextMenuClosed(custom_context); 5667 pepper_delegate_.OnContextMenuClosed(custom_context);
5667 else 5668 else
5668 context_menu_node_.reset(); 5669 context_menu_node_.reset();
5669 } 5670 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698