Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(820)

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 2151743002: Pass validated URL to WebContentsObserver::DidFailProvidsionalLoad. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: git cl format Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/browser/web_contents/web_contents_impl.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 3207 matching lines...) Expand 10 before | Expand all | Expand 10 after
3218 FrameTreeNode* ftn = render_frame_host->frame_tree_node(); 3218 FrameTreeNode* ftn = render_frame_host->frame_tree_node();
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 GURL& validated_url,
3229 GURL validated_url(params.url); 3229 int error_code,
3230 FOR_EACH_OBSERVER(WebContentsObserver, 3230 const base::string16& error_description,
3231 observers_, 3231 bool was_ignored_by_handler) {
3232 DidFailProvisionalLoad(render_frame_host, 3232 FOR_EACH_OBSERVER(
3233 validated_url, 3233 WebContentsObserver, observers_,
3234 params.error_code, 3234 DidFailProvisionalLoad(render_frame_host, validated_url, error_code,
3235 params.error_description, 3235 error_description, was_ignored_by_handler));
3236 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 }
3244 3243
3245 void WebContentsImpl::DidFailLoadWithError( 3244 void WebContentsImpl::DidFailLoadWithError(
3246 RenderFrameHostImpl* render_frame_host, 3245 RenderFrameHostImpl* render_frame_host,
(...skipping 1924 matching lines...) Expand 10 before | Expand all | Expand 10 after
5171 for (RenderViewHost* render_view_host : render_view_host_set) 5170 for (RenderViewHost* render_view_host : render_view_host_set)
5172 render_view_host->OnWebkitPreferencesChanged(); 5171 render_view_host->OnWebkitPreferencesChanged();
5173 } 5172 }
5174 5173
5175 void WebContentsImpl::SetJavaScriptDialogManagerForTesting( 5174 void WebContentsImpl::SetJavaScriptDialogManagerForTesting(
5176 JavaScriptDialogManager* dialog_manager) { 5175 JavaScriptDialogManager* dialog_manager) {
5177 dialog_manager_ = dialog_manager; 5176 dialog_manager_ = dialog_manager;
5178 } 5177 }
5179 5178
5180 } // namespace content 5179 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698