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

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

Issue 6621006: Take out the is_content_filtered bool that gets passed around betwen renderer... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 9 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 1633 matching lines...) Expand 10 before | Expand all | Expand 10 after
1644 const WebURLResponse& response = ds->response(); 1644 const WebURLResponse& response = ds->response();
1645 1645
1646 NavigationState* navigation_state = NavigationState::FromDataSource(ds); 1646 NavigationState* navigation_state = NavigationState::FromDataSource(ds);
1647 DCHECK(navigation_state); 1647 DCHECK(navigation_state);
1648 1648
1649 ViewHostMsg_FrameNavigate_Params params; 1649 ViewHostMsg_FrameNavigate_Params params;
1650 params.http_status_code = response.httpStatusCode(); 1650 params.http_status_code = response.httpStatusCode();
1651 params.is_post = false; 1651 params.is_post = false;
1652 params.page_id = page_id_; 1652 params.page_id = page_id_;
1653 params.frame_id = frame->identifier(); 1653 params.frame_id = frame->identifier();
1654 params.is_content_filtered = response.isContentFiltered();
1655 params.socket_address.set_host(response.remoteIPAddress().utf8()); 1654 params.socket_address.set_host(response.remoteIPAddress().utf8());
1656 params.socket_address.set_port(response.remotePort()); 1655 params.socket_address.set_port(response.remotePort());
1657 params.was_fetched_via_proxy = response.wasFetchedViaProxy(); 1656 params.was_fetched_via_proxy = response.wasFetchedViaProxy();
1658 params.was_within_same_page = navigation_state->was_within_same_page(); 1657 params.was_within_same_page = navigation_state->was_within_same_page();
1659 if (!navigation_state->security_info().empty()) { 1658 if (!navigation_state->security_info().empty()) {
1660 // SSL state specified in the request takes precedence over the one in the 1659 // SSL state specified in the request takes precedence over the one in the
1661 // response. 1660 // response.
1662 // So far this is only intended for error pages that are not expected to be 1661 // So far this is only intended for error pages that are not expected to be
1663 // over ssl, so we should not get any clash. 1662 // over ssl, so we should not get any clash.
1664 DCHECK(response.securityInfo().isEmpty()); 1663 DCHECK(response.securityInfo().isEmpty());
(...skipping 4039 matching lines...) Expand 10 before | Expand all | Expand 10 after
5704 } 5703 }
5705 } 5704 }
5706 5705
5707 void RenderView::OnContextMenuClosed( 5706 void RenderView::OnContextMenuClosed(
5708 const webkit_glue::CustomContextMenuContext& custom_context) { 5707 const webkit_glue::CustomContextMenuContext& custom_context) {
5709 if (custom_context.is_pepper_menu) 5708 if (custom_context.is_pepper_menu)
5710 pepper_delegate_.OnContextMenuClosed(custom_context); 5709 pepper_delegate_.OnContextMenuClosed(custom_context);
5711 else 5710 else
5712 context_menu_node_.reset(); 5711 context_menu_node_.reset();
5713 } 5712 }
OLDNEW
« no previous file with comments | « chrome/plugin/chrome_plugin_host.cc ('k') | content/browser/renderer_host/test_render_view_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698