| 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 998 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1009 } | 1009 } |
| 1010 | 1010 |
| 1011 void RenderViewHostImpl::OnUpdateState(int32 page_id, const PageState& state) { | 1011 void RenderViewHostImpl::OnUpdateState(int32 page_id, const PageState& state) { |
| 1012 // Without this check, the renderer can trick the browser into using | 1012 // Without this check, the renderer can trick the browser into using |
| 1013 // filenames it can't access in a future session restore. | 1013 // filenames it can't access in a future session restore. |
| 1014 if (!CanAccessFilesOfPageState(state)) { | 1014 if (!CanAccessFilesOfPageState(state)) { |
| 1015 GetProcess()->ReceivedBadMessage(); | 1015 GetProcess()->ReceivedBadMessage(); |
| 1016 return; | 1016 return; |
| 1017 } | 1017 } |
| 1018 | 1018 |
| 1019 delegate_->UpdateState(this, page_id, state); | 1019 delegate_->UpdateState(this, page_id_, page_id, state); |
| 1020 } | 1020 } |
| 1021 | 1021 |
| 1022 void RenderViewHostImpl::OnUpdateTargetURL(const GURL& url) { | 1022 void RenderViewHostImpl::OnUpdateTargetURL(const GURL& url) { |
| 1023 if (is_active_) | 1023 if (is_active_) |
| 1024 delegate_->UpdateTargetURL(url); | 1024 delegate_->UpdateTargetURL(url); |
| 1025 | 1025 |
| 1026 // Send a notification back to the renderer that we are ready to | 1026 // Send a notification back to the renderer that we are ready to |
| 1027 // receive more target urls. | 1027 // receive more target urls. |
| 1028 Send(new ViewMsg_UpdateTargetURL_ACK(GetRoutingID())); | 1028 Send(new ViewMsg_UpdateTargetURL_ACK(GetRoutingID())); |
| 1029 } | 1029 } |
| (...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1405 FrameTree* frame_tree = delegate_->GetFrameTree(); | 1405 FrameTree* frame_tree = delegate_->GetFrameTree(); |
| 1406 | 1406 |
| 1407 frame_tree->ResetForMainFrameSwap(); | 1407 frame_tree->ResetForMainFrameSwap(); |
| 1408 } | 1408 } |
| 1409 | 1409 |
| 1410 void RenderViewHostImpl::SelectWordAroundCaret() { | 1410 void RenderViewHostImpl::SelectWordAroundCaret() { |
| 1411 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); | 1411 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); |
| 1412 } | 1412 } |
| 1413 | 1413 |
| 1414 } // namespace content | 1414 } // namespace content |
| OLD | NEW |