OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 "app/resource_bundle.h" | 10 #include "app/resource_bundle.h" |
(...skipping 927 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
938 FilterURL(policy, renderer_id, &validated_params.url); | 938 FilterURL(policy, renderer_id, &validated_params.url); |
939 FilterURL(policy, renderer_id, &validated_params.referrer); | 939 FilterURL(policy, renderer_id, &validated_params.referrer); |
940 for (std::vector<GURL>::iterator it(validated_params.redirects.begin()); | 940 for (std::vector<GURL>::iterator it(validated_params.redirects.begin()); |
941 it != validated_params.redirects.end(); ++it) { | 941 it != validated_params.redirects.end(); ++it) { |
942 FilterURL(policy, renderer_id, &(*it)); | 942 FilterURL(policy, renderer_id, &(*it)); |
943 } | 943 } |
944 FilterURL(policy, renderer_id, &validated_params.searchable_form_url); | 944 FilterURL(policy, renderer_id, &validated_params.searchable_form_url); |
945 FilterURL(policy, renderer_id, &validated_params.password_form.origin); | 945 FilterURL(policy, renderer_id, &validated_params.password_form.origin); |
946 FilterURL(policy, renderer_id, &validated_params.password_form.action); | 946 FilterURL(policy, renderer_id, &validated_params.password_form.action); |
947 | 947 |
948 delegate_->DidNavigate(this, validated_params); | |
949 | |
950 if (PageTransition::IsMainFrame(validated_params.transition)) { | 948 if (PageTransition::IsMainFrame(validated_params.transition)) { |
951 ExtensionFunctionDispatcher* new_efd = NULL; | 949 ExtensionFunctionDispatcher* new_efd = NULL; |
952 if (validated_params.url.SchemeIs(chrome::kExtensionScheme)) { | 950 if (validated_params.url.SchemeIs(chrome::kExtensionScheme)) { |
953 new_efd = delegate()->CreateExtensionFunctionDispatcher(this, | 951 new_efd = delegate()->CreateExtensionFunctionDispatcher(this, |
954 validated_params.url.host()); | 952 validated_params.url.host()); |
955 } | 953 } |
956 extension_function_dispatcher_.reset(new_efd); | 954 extension_function_dispatcher_.reset(new_efd); |
957 } | 955 } |
958 | 956 |
| 957 delegate_->DidNavigate(this, validated_params); |
| 958 |
959 UpdateBackForwardListCount(); | 959 UpdateBackForwardListCount(); |
960 } | 960 } |
961 | 961 |
962 void RenderViewHost::OnMsgUpdateState(int32 page_id, | 962 void RenderViewHost::OnMsgUpdateState(int32 page_id, |
963 const std::string& state) { | 963 const std::string& state) { |
964 delegate_->UpdateState(this, page_id, state); | 964 delegate_->UpdateState(this, page_id, state); |
965 } | 965 } |
966 | 966 |
967 void RenderViewHost::OnMsgUpdateTitle(int32 page_id, | 967 void RenderViewHost::OnMsgUpdateTitle(int32 page_id, |
968 const std::wstring& title) { | 968 const std::wstring& title) { |
(...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1468 } | 1468 } |
1469 | 1469 |
1470 void RenderViewHost::OnAccessibilityFocusChange(int acc_obj_id) { | 1470 void RenderViewHost::OnAccessibilityFocusChange(int acc_obj_id) { |
1471 #if defined(OS_WIN) | 1471 #if defined(OS_WIN) |
1472 BrowserAccessibilityManager::GetInstance()-> | 1472 BrowserAccessibilityManager::GetInstance()-> |
1473 ChangeAccessibilityFocus(acc_obj_id, process()->pid(), routing_id()); | 1473 ChangeAccessibilityFocus(acc_obj_id, process()->pid(), routing_id()); |
1474 #else | 1474 #else |
1475 // TODO(port): accessibility not yet implemented. See http://crbug.com/8288. | 1475 // TODO(port): accessibility not yet implemented. See http://crbug.com/8288. |
1476 #endif | 1476 #endif |
1477 } | 1477 } |
OLD | NEW |