| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/browser/renderer_host/render_view_host_impl.h" | 5 #include "content/browser/renderer_host/render_view_host_impl.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 1010 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1021 } | 1021 } |
| 1022 | 1022 |
| 1023 void RenderViewHostImpl::OnUpdateState(int32 page_id, const PageState& state) { | 1023 void RenderViewHostImpl::OnUpdateState(int32 page_id, const PageState& state) { |
| 1024 // Without this check, the renderer can trick the browser into using | 1024 // Without this check, the renderer can trick the browser into using |
| 1025 // filenames it can't access in a future session restore. | 1025 // filenames it can't access in a future session restore. |
| 1026 if (!CanAccessFilesOfPageState(state)) { | 1026 if (!CanAccessFilesOfPageState(state)) { |
| 1027 GetProcess()->ReceivedBadMessage(); | 1027 GetProcess()->ReceivedBadMessage(); |
| 1028 return; | 1028 return; |
| 1029 } | 1029 } |
| 1030 | 1030 |
| 1031 delegate_->UpdateState(this, page_id, state); | 1031 delegate_->UpdateState(this, page_id_, page_id, state); |
| 1032 } | 1032 } |
| 1033 | 1033 |
| 1034 void RenderViewHostImpl::OnUpdateTargetURL(const GURL& url) { | 1034 void RenderViewHostImpl::OnUpdateTargetURL(const GURL& url) { |
| 1035 if (is_active_) | 1035 if (is_active_) |
| 1036 delegate_->UpdateTargetURL(url); | 1036 delegate_->UpdateTargetURL(url); |
| 1037 | 1037 |
| 1038 // Send a notification back to the renderer that we are ready to | 1038 // Send a notification back to the renderer that we are ready to |
| 1039 // receive more target urls. | 1039 // receive more target urls. |
| 1040 Send(new ViewMsg_UpdateTargetURL_ACK(GetRoutingID())); | 1040 Send(new ViewMsg_UpdateTargetURL_ACK(GetRoutingID())); |
| 1041 } | 1041 } |
| (...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1417 FrameTree* frame_tree = delegate_->GetFrameTree(); | 1417 FrameTree* frame_tree = delegate_->GetFrameTree(); |
| 1418 | 1418 |
| 1419 frame_tree->ResetForMainFrameSwap(); | 1419 frame_tree->ResetForMainFrameSwap(); |
| 1420 } | 1420 } |
| 1421 | 1421 |
| 1422 void RenderViewHostImpl::SelectWordAroundCaret() { | 1422 void RenderViewHostImpl::SelectWordAroundCaret() { |
| 1423 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); | 1423 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); |
| 1424 } | 1424 } |
| 1425 | 1425 |
| 1426 } // namespace content | 1426 } // namespace content |
| OLD | NEW |