| OLD | NEW |
| 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/browser/renderer_host/render_view_host.h" | 5 #include "chrome/browser/renderer_host/render_view_host.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/gfx/native_widget_types.h" | 10 #include "base/gfx/native_widget_types.h" |
| (...skipping 932 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 943 } | 943 } |
| 944 | 944 |
| 945 void RenderViewHost::OnMsgDidStopLoading(int32 page_id) { | 945 void RenderViewHost::OnMsgDidStopLoading(int32 page_id) { |
| 946 delegate_->DidStopLoading(this, page_id); | 946 delegate_->DidStopLoading(this, page_id); |
| 947 if (view()) | 947 if (view()) |
| 948 view()->UpdateCursorIfOverSelf(); | 948 view()->UpdateCursorIfOverSelf(); |
| 949 } | 949 } |
| 950 | 950 |
| 951 void RenderViewHost::OnMsgDidLoadResourceFromMemoryCache( | 951 void RenderViewHost::OnMsgDidLoadResourceFromMemoryCache( |
| 952 const GURL& url, | 952 const GURL& url, |
| 953 const std::string& frame_origin, |
| 954 const std::string& main_frame_origin, |
| 953 const std::string& security_info) { | 955 const std::string& security_info) { |
| 954 delegate_->DidLoadResourceFromMemoryCache(url, security_info); | 956 delegate_->DidLoadResourceFromMemoryCache( |
| 957 url, frame_origin, main_frame_origin, security_info); |
| 955 } | 958 } |
| 956 | 959 |
| 957 void RenderViewHost::OnMsgDidStartProvisionalLoadForFrame(bool is_main_frame, | 960 void RenderViewHost::OnMsgDidStartProvisionalLoadForFrame(bool is_main_frame, |
| 958 const GURL& url) { | 961 const GURL& url) { |
| 959 GURL validated_url(url); | 962 GURL validated_url(url); |
| 960 FilterURL(RendererSecurityPolicy::GetInstance(), | 963 FilterURL(RendererSecurityPolicy::GetInstance(), |
| 961 process()->pid(), &validated_url); | 964 process()->pid(), &validated_url); |
| 962 | 965 |
| 963 delegate_->DidStartProvisionalLoadForFrame(this, is_main_frame, | 966 delegate_->DidStartProvisionalLoadForFrame(this, is_main_frame, |
| 964 validated_url); | 967 validated_url); |
| (...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1342 Send(new ViewMsg_PersonalizationEvent(routing_id(), event_name, event_arg)); | 1345 Send(new ViewMsg_PersonalizationEvent(routing_id(), event_name, event_arg)); |
| 1343 } | 1346 } |
| 1344 #endif | 1347 #endif |
| 1345 | 1348 |
| 1346 void RenderViewHost::ForwardMessageFromExternalHost(const std::string& message, | 1349 void RenderViewHost::ForwardMessageFromExternalHost(const std::string& message, |
| 1347 const std::string& origin, | 1350 const std::string& origin, |
| 1348 const std::string& target) { | 1351 const std::string& target) { |
| 1349 Send(new ViewMsg_HandleMessageFromExternalHost(routing_id(), message, origin, | 1352 Send(new ViewMsg_HandleMessageFromExternalHost(routing_id(), message, origin, |
| 1350 target)); | 1353 target)); |
| 1351 } | 1354 } |
| OLD | NEW |