Chromium Code Reviews| 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/web_contents/web_contents_impl.h" | 5 #include "content/browser/web_contents/web_contents_impl.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <cmath> | 9 #include <cmath> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 3208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3219 BrowserAccessibilityManager* manager = | 3219 BrowserAccessibilityManager* manager = |
| 3220 ftn->current_frame_host()->browser_accessibility_manager(); | 3220 ftn->current_frame_host()->browser_accessibility_manager(); |
| 3221 if (manager) | 3221 if (manager) |
| 3222 manager->UserIsReloading(); | 3222 manager->UserIsReloading(); |
| 3223 } | 3223 } |
| 3224 } | 3224 } |
| 3225 | 3225 |
| 3226 void WebContentsImpl::DidFailProvisionalLoadWithError( | 3226 void WebContentsImpl::DidFailProvisionalLoadWithError( |
| 3227 RenderFrameHostImpl* render_frame_host, | 3227 RenderFrameHostImpl* render_frame_host, |
| 3228 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) { | 3228 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) { |
| 3229 GURL validated_url(params.url); | |
| 3230 FOR_EACH_OBSERVER(WebContentsObserver, | 3229 FOR_EACH_OBSERVER(WebContentsObserver, |
| 3231 observers_, | 3230 observers_, |
| 3232 DidFailProvisionalLoad(render_frame_host, | 3231 DidFailProvisionalLoad(render_frame_host, |
| 3233 validated_url, | 3232 params.url, |
|
nasko
2016/07/14 00:39:21
The validation has been moved to NavigatorImpl::Di
lazyboy
2016/07/14 00:48:52
Right.
nasko
2016/07/14 14:22:46
Let's just modify the method to take the exact par
| |
| 3234 params.error_code, | 3233 params.error_code, |
| 3235 params.error_description, | 3234 params.error_description, |
| 3236 params.was_ignored_by_handler)); | 3235 params.was_ignored_by_handler)); |
| 3237 | 3236 |
| 3238 FrameTreeNode* ftn = render_frame_host->frame_tree_node(); | 3237 FrameTreeNode* ftn = render_frame_host->frame_tree_node(); |
| 3239 BrowserAccessibilityManager* manager = | 3238 BrowserAccessibilityManager* manager = |
| 3240 ftn->current_frame_host()->browser_accessibility_manager(); | 3239 ftn->current_frame_host()->browser_accessibility_manager(); |
| 3241 if (manager) | 3240 if (manager) |
| 3242 manager->NavigationFailed(); | 3241 manager->NavigationFailed(); |
| 3243 } | 3242 } |
| (...skipping 1930 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 5174 for (RenderViewHost* render_view_host : render_view_host_set) | 5173 for (RenderViewHost* render_view_host : render_view_host_set) |
| 5175 render_view_host->OnWebkitPreferencesChanged(); | 5174 render_view_host->OnWebkitPreferencesChanged(); |
| 5176 } | 5175 } |
| 5177 | 5176 |
| 5178 void WebContentsImpl::SetJavaScriptDialogManagerForTesting( | 5177 void WebContentsImpl::SetJavaScriptDialogManagerForTesting( |
| 5179 JavaScriptDialogManager* dialog_manager) { | 5178 JavaScriptDialogManager* dialog_manager) { |
| 5180 dialog_manager_ = dialog_manager; | 5179 dialog_manager_ = dialog_manager; |
| 5181 } | 5180 } |
| 5182 | 5181 |
| 5183 } // namespace content | 5182 } // namespace content |
| OLD | NEW |