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

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

Issue 6369003: New extension API: "tab.socketAddress" (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 9 years, 11 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 1646 matching lines...) Expand 10 before | Expand all | Expand 10 after
1657 1657
1658 NavigationState* navigation_state = NavigationState::FromDataSource(ds); 1658 NavigationState* navigation_state = NavigationState::FromDataSource(ds);
1659 DCHECK(navigation_state); 1659 DCHECK(navigation_state);
1660 1660
1661 ViewHostMsg_FrameNavigate_Params params; 1661 ViewHostMsg_FrameNavigate_Params params;
1662 params.http_status_code = response.httpStatusCode(); 1662 params.http_status_code = response.httpStatusCode();
1663 params.is_post = false; 1663 params.is_post = false;
1664 params.page_id = page_id_; 1664 params.page_id = page_id_;
1665 params.frame_id = frame->identifier(); 1665 params.frame_id = frame->identifier();
1666 params.is_content_filtered = response.isContentFiltered(); 1666 params.is_content_filtered = response.isContentFiltered();
1667 params.socket_address = response.socketAddress().utf8();
1667 params.was_within_same_page = navigation_state->was_within_same_page(); 1668 params.was_within_same_page = navigation_state->was_within_same_page();
1668 if (!navigation_state->security_info().empty()) { 1669 if (!navigation_state->security_info().empty()) {
1669 // SSL state specified in the request takes precedence over the one in the 1670 // SSL state specified in the request takes precedence over the one in the
1670 // response. 1671 // response.
1671 // So far this is only intended for error pages that are not expected to be 1672 // So far this is only intended for error pages that are not expected to be
1672 // over ssl, so we should not get any clash. 1673 // over ssl, so we should not get any clash.
1673 DCHECK(response.securityInfo().isEmpty()); 1674 DCHECK(response.securityInfo().isEmpty());
1674 params.security_info = navigation_state->security_info(); 1675 params.security_info = navigation_state->security_info();
1675 } else { 1676 } else {
1676 params.security_info = response.securityInfo(); 1677 params.security_info = response.securityInfo();
(...skipping 4007 matching lines...) Expand 10 before | Expand all | Expand 10 after
5684 if (cmd == kJavaScriptStressTestSetStressRunType) { 5685 if (cmd == kJavaScriptStressTestSetStressRunType) {
5685 v8::Testing::SetStressRunType(static_cast<v8::Testing::StressType>(param)); 5686 v8::Testing::SetStressRunType(static_cast<v8::Testing::StressType>(param));
5686 } else if (cmd == kJavaScriptStressTestPrepareStressRun) { 5687 } else if (cmd == kJavaScriptStressTestPrepareStressRun) {
5687 v8::Testing::PrepareStressRun(param); 5688 v8::Testing::PrepareStressRun(param);
5688 } 5689 }
5689 } 5690 }
5690 5691
5691 void RenderView::OnContextMenuClosed() { 5692 void RenderView::OnContextMenuClosed() {
5692 context_menu_node_.reset(); 5693 context_menu_node_.reset();
5693 } 5694 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698