| OLD | NEW |
| 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 "content/renderer/render_view.h" | 5 #include "content/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 2714 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2725 } | 2725 } |
| 2726 | 2726 |
| 2727 void RenderView::didLoadResourceFromMemoryCache( | 2727 void RenderView::didLoadResourceFromMemoryCache( |
| 2728 WebFrame* frame, const WebURLRequest& request, | 2728 WebFrame* frame, const WebURLRequest& request, |
| 2729 const WebURLResponse& response) { | 2729 const WebURLResponse& response) { |
| 2730 // Let the browser know we loaded a resource from the memory cache. This | 2730 // Let the browser know we loaded a resource from the memory cache. This |
| 2731 // message is needed to display the correct SSL indicators. | 2731 // message is needed to display the correct SSL indicators. |
| 2732 Send(new ViewHostMsg_DidLoadResourceFromMemoryCache( | 2732 Send(new ViewHostMsg_DidLoadResourceFromMemoryCache( |
| 2733 routing_id_, | 2733 routing_id_, |
| 2734 request.url(), | 2734 request.url(), |
| 2735 response.securityInfo())); | 2735 response.securityInfo(), |
| 2736 request.httpMethod().utf8())); |
| 2736 } | 2737 } |
| 2737 | 2738 |
| 2738 void RenderView::didDisplayInsecureContent(WebFrame* frame) { | 2739 void RenderView::didDisplayInsecureContent(WebFrame* frame) { |
| 2739 Send(new ViewHostMsg_DidDisplayInsecureContent(routing_id_)); | 2740 Send(new ViewHostMsg_DidDisplayInsecureContent(routing_id_)); |
| 2740 } | 2741 } |
| 2741 | 2742 |
| 2742 void RenderView::didRunInsecureContent( | 2743 void RenderView::didRunInsecureContent( |
| 2743 WebFrame* frame, const WebSecurityOrigin& origin, const WebURL& target) { | 2744 WebFrame* frame, const WebSecurityOrigin& origin, const WebURL& target) { |
| 2744 Send(new ViewHostMsg_DidRunInsecureContent( | 2745 Send(new ViewHostMsg_DidRunInsecureContent( |
| 2745 routing_id_, | 2746 routing_id_, |
| (...skipping 1643 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4389 } | 4390 } |
| 4390 #endif | 4391 #endif |
| 4391 | 4392 |
| 4392 void RenderView::OnContextMenuClosed( | 4393 void RenderView::OnContextMenuClosed( |
| 4393 const webkit_glue::CustomContextMenuContext& custom_context) { | 4394 const webkit_glue::CustomContextMenuContext& custom_context) { |
| 4394 if (custom_context.is_pepper_menu) | 4395 if (custom_context.is_pepper_menu) |
| 4395 pepper_delegate_.OnContextMenuClosed(custom_context); | 4396 pepper_delegate_.OnContextMenuClosed(custom_context); |
| 4396 else | 4397 else |
| 4397 context_menu_node_.reset(); | 4398 context_menu_node_.reset(); |
| 4398 } | 4399 } |
| OLD | NEW |