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

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

Issue 42263: SSL Fix: Step 4.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 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
« no previous file with comments | « chrome/common/render_messages_internal.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 1245 matching lines...) Expand 10 before | Expand all | Expand 10 after
1256 frame->GetProvisionalDataSource()->GetRequest().GetURL())); 1256 frame->GetProvisionalDataSource()->GetRequest().GetURL()));
1257 } 1257 }
1258 1258
1259 bool RenderView::DidLoadResourceFromMemoryCache(WebView* webview, 1259 bool RenderView::DidLoadResourceFromMemoryCache(WebView* webview,
1260 const WebRequest& request, 1260 const WebRequest& request,
1261 const WebResponse& response, 1261 const WebResponse& response,
1262 WebFrame* frame) { 1262 WebFrame* frame) {
1263 // Let the browser know we loaded a resource from the memory cache. This 1263 // Let the browser know we loaded a resource from the memory cache. This
1264 // message is needed to display the correct SSL indicators. 1264 // message is needed to display the correct SSL indicators.
1265 Send(new ViewHostMsg_DidLoadResourceFromMemoryCache(routing_id_, 1265 Send(new ViewHostMsg_DidLoadResourceFromMemoryCache(routing_id_,
1266 request.GetURL(), response.GetSecurityInfo())); 1266 request.GetURL(), frame->GetSecurityOrigin(),
1267 frame->GetTop()->GetSecurityOrigin(),
1268 response.GetSecurityInfo()));
1267 1269
1268 return false; 1270 return false;
1269 } 1271 }
1270 1272
1271 void RenderView::DidReceiveProvisionalLoadServerRedirect(WebView* webview, 1273 void RenderView::DidReceiveProvisionalLoadServerRedirect(WebView* webview,
1272 WebFrame* frame) { 1274 WebFrame* frame) {
1273 if (frame == webview->GetMainFrame()) { 1275 if (frame == webview->GetMainFrame()) {
1274 // Received a redirect on the main frame. 1276 // Received a redirect on the main frame.
1275 WebDataSource* data_source = 1277 WebDataSource* data_source =
1276 webview->GetMainFrame()->GetProvisionalDataSource(); 1278 webview->GetMainFrame()->GetProvisionalDataSource();
(...skipping 1677 matching lines...) Expand 10 before | Expand all | Expand 10 after
2954 DCHECK(audio_renderers_.Lookup(stream_id) != NULL); 2956 DCHECK(audio_renderers_.Lookup(stream_id) != NULL);
2955 Send(new ViewHostMsg_SetAudioVolume(routing_id_, stream_id, left, right)); 2957 Send(new ViewHostMsg_SetAudioVolume(routing_id_, stream_id, left, right));
2956 } 2958 }
2957 2959
2958 void RenderView::OnResize(const gfx::Size& new_size, 2960 void RenderView::OnResize(const gfx::Size& new_size,
2959 const gfx::Rect& resizer_rect) { 2961 const gfx::Rect& resizer_rect) {
2960 if (webview()) 2962 if (webview())
2961 webview()->HideAutofillPopup(); 2963 webview()->HideAutofillPopup();
2962 RenderWidget::OnResize(new_size, resizer_rect); 2964 RenderWidget::OnResize(new_size, resizer_rect);
2963 } 2965 }
OLDNEW
« no previous file with comments | « chrome/common/render_messages_internal.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698