| 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 2725 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2736 } | 2736 } |
| 2737 | 2737 |
| 2738 void RenderView::didLoadResourceFromMemoryCache( | 2738 void RenderView::didLoadResourceFromMemoryCache( |
| 2739 WebFrame* frame, const WebURLRequest& request, | 2739 WebFrame* frame, const WebURLRequest& request, |
| 2740 const WebURLResponse& response) { | 2740 const WebURLResponse& response) { |
| 2741 // Let the browser know we loaded a resource from the memory cache. This | 2741 // Let the browser know we loaded a resource from the memory cache. This |
| 2742 // message is needed to display the correct SSL indicators. | 2742 // message is needed to display the correct SSL indicators. |
| 2743 Send(new ViewHostMsg_DidLoadResourceFromMemoryCache( | 2743 Send(new ViewHostMsg_DidLoadResourceFromMemoryCache( |
| 2744 routing_id_, | 2744 routing_id_, |
| 2745 request.url(), | 2745 request.url(), |
| 2746 response.securityInfo())); | 2746 response.securityInfo(), |
| 2747 request.httpMethod().utf8(), |
| 2748 ResourceType::FromTargetType(request.targetType()))); |
| 2747 } | 2749 } |
| 2748 | 2750 |
| 2749 void RenderView::didDisplayInsecureContent(WebFrame* frame) { | 2751 void RenderView::didDisplayInsecureContent(WebFrame* frame) { |
| 2750 Send(new ViewHostMsg_DidDisplayInsecureContent(routing_id_)); | 2752 Send(new ViewHostMsg_DidDisplayInsecureContent(routing_id_)); |
| 2751 } | 2753 } |
| 2752 | 2754 |
| 2753 void RenderView::didRunInsecureContent( | 2755 void RenderView::didRunInsecureContent( |
| 2754 WebFrame* frame, const WebSecurityOrigin& origin, const WebURL& target) { | 2756 WebFrame* frame, const WebSecurityOrigin& origin, const WebURL& target) { |
| 2755 Send(new ViewHostMsg_DidRunInsecureContent( | 2757 Send(new ViewHostMsg_DidRunInsecureContent( |
| 2756 routing_id_, | 2758 routing_id_, |
| (...skipping 1674 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4431 } | 4433 } |
| 4432 #endif | 4434 #endif |
| 4433 | 4435 |
| 4434 void RenderView::OnContextMenuClosed( | 4436 void RenderView::OnContextMenuClosed( |
| 4435 const webkit_glue::CustomContextMenuContext& custom_context) { | 4437 const webkit_glue::CustomContextMenuContext& custom_context) { |
| 4436 if (custom_context.is_pepper_menu) | 4438 if (custom_context.is_pepper_menu) |
| 4437 pepper_delegate_.OnContextMenuClosed(custom_context); | 4439 pepper_delegate_.OnContextMenuClosed(custom_context); |
| 4438 else | 4440 else |
| 4439 context_menu_node_.reset(); | 4441 context_menu_node_.reset(); |
| 4440 } | 4442 } |
| OLD | NEW |