Chromium Code Reviews| 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 2703 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2714 | 2714 |
| 2715 void RenderView::didLoadResourceFromMemoryCache( | 2715 void RenderView::didLoadResourceFromMemoryCache( |
| 2716 WebFrame* frame, const WebURLRequest& request, | 2716 WebFrame* frame, const WebURLRequest& request, |
| 2717 const WebURLResponse& response) { | 2717 const WebURLResponse& response) { |
| 2718 // Let the browser know we loaded a resource from the memory cache. This | 2718 // Let the browser know we loaded a resource from the memory cache. This |
| 2719 // message is needed to display the correct SSL indicators. | 2719 // message is needed to display the correct SSL indicators. |
| 2720 Send(new ViewHostMsg_DidLoadResourceFromMemoryCache( | 2720 Send(new ViewHostMsg_DidLoadResourceFromMemoryCache( |
| 2721 routing_id_, | 2721 routing_id_, |
| 2722 request.url(), | 2722 request.url(), |
| 2723 response.securityInfo())); | 2723 response.securityInfo())); |
| 2724 Send(new ViewHostMsg_DidAccessResourceInMemoryCache( | |
|
rvargas (doing something else)
2011/07/27 23:26:17
It seems unfortunate to send two IPCs messages for
| |
| 2725 request.url(), | |
| 2726 request.httpMethod().utf8())); | |
| 2724 } | 2727 } |
| 2725 | 2728 |
| 2726 void RenderView::didDisplayInsecureContent(WebFrame* frame) { | 2729 void RenderView::didDisplayInsecureContent(WebFrame* frame) { |
| 2727 Send(new ViewHostMsg_DidDisplayInsecureContent(routing_id_)); | 2730 Send(new ViewHostMsg_DidDisplayInsecureContent(routing_id_)); |
| 2728 } | 2731 } |
| 2729 | 2732 |
| 2730 void RenderView::didRunInsecureContent( | 2733 void RenderView::didRunInsecureContent( |
| 2731 WebFrame* frame, const WebSecurityOrigin& origin, const WebURL& target) { | 2734 WebFrame* frame, const WebSecurityOrigin& origin, const WebURL& target) { |
| 2732 Send(new ViewHostMsg_DidRunInsecureContent( | 2735 Send(new ViewHostMsg_DidRunInsecureContent( |
| 2733 routing_id_, | 2736 routing_id_, |
| (...skipping 1643 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4377 } | 4380 } |
| 4378 #endif | 4381 #endif |
| 4379 | 4382 |
| 4380 void RenderView::OnContextMenuClosed( | 4383 void RenderView::OnContextMenuClosed( |
| 4381 const webkit_glue::CustomContextMenuContext& custom_context) { | 4384 const webkit_glue::CustomContextMenuContext& custom_context) { |
| 4382 if (custom_context.is_pepper_menu) | 4385 if (custom_context.is_pepper_menu) |
| 4383 pepper_delegate_.OnContextMenuClosed(custom_context); | 4386 pepper_delegate_.OnContextMenuClosed(custom_context); |
| 4384 else | 4387 else |
| 4385 context_menu_node_.reset(); | 4388 context_menu_node_.reset(); |
| 4386 } | 4389 } |
| OLD | NEW |