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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 2657323003: Convert HistoryTabHelper to use the new navigation callbacks. (Closed)
Patch Set: nit Created 3 years, 10 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 3453 matching lines...) Expand 10 before | Expand all | Expand 10 after
3464 3464
3465 base::TimeTicks navigation_start = 3465 base::TimeTicks navigation_start =
3466 navigation_state->common_params().navigation_start; 3466 navigation_state->common_params().navigation_start;
3467 DCHECK(!navigation_start.is_null()); 3467 DCHECK(!navigation_start.is_null());
3468 3468
3469 for (auto& observer : render_view_->observers()) 3469 for (auto& observer : render_view_->observers())
3470 observer.DidStartProvisionalLoad(frame); 3470 observer.DidStartProvisionalLoad(frame);
3471 for (auto& observer : observers_) 3471 for (auto& observer : observers_)
3472 observer.DidStartProvisionalLoad(); 3472 observer.DidStartProvisionalLoad();
3473 3473
3474 std::vector<GURL> redirect_chain;
3475 GetRedirectChain(ds, &redirect_chain);
3476 CHECK(!redirect_chain.empty());
3474 Send(new FrameHostMsg_DidStartProvisionalLoad( 3477 Send(new FrameHostMsg_DidStartProvisionalLoad(
3475 routing_id_, ds->getRequest().url(), navigation_start)); 3478 routing_id_, ds->getRequest().url(), redirect_chain, navigation_start));
3476 } 3479 }
3477 3480
3478 void RenderFrameImpl::didReceiveServerRedirectForProvisionalLoad( 3481 void RenderFrameImpl::didReceiveServerRedirectForProvisionalLoad(
3479 blink::WebLocalFrame* frame) { 3482 blink::WebLocalFrame* frame) {
3480 DCHECK_EQ(frame_, frame); 3483 DCHECK_EQ(frame_, frame);
3481 3484
3482 // TODO(creis): Determine if this can be removed or if we need to clear any 3485 // TODO(creis): Determine if this can be removed or if we need to clear any
3483 // local state here to fix https://crbug.com/671276. 3486 // local state here to fix https://crbug.com/671276.
3484 } 3487 }
3485 3488
(...skipping 2753 matching lines...) Expand 10 before | Expand all | Expand 10 after
6239 initiator_origin); 6242 initiator_origin);
6240 6243
6241 if (!info.form.isNull()) { 6244 if (!info.form.isNull()) {
6242 WebSearchableFormData web_searchable_form_data(info.form); 6245 WebSearchableFormData web_searchable_form_data(info.form);
6243 begin_navigation_params.searchable_form_url = 6246 begin_navigation_params.searchable_form_url =
6244 web_searchable_form_data.url(); 6247 web_searchable_form_data.url();
6245 begin_navigation_params.searchable_form_encoding = 6248 begin_navigation_params.searchable_form_encoding =
6246 web_searchable_form_data.encoding().utf8(); 6249 web_searchable_form_data.encoding().utf8();
6247 } 6250 }
6248 6251
6252 if (info.isClientRedirect)
6253 begin_navigation_params.client_side_redirect_url = frame_->document().url();
6254
6249 Send(new FrameHostMsg_BeginNavigation( 6255 Send(new FrameHostMsg_BeginNavigation(
6250 routing_id_, MakeCommonNavigationParams(info), begin_navigation_params)); 6256 routing_id_, MakeCommonNavigationParams(info), begin_navigation_params));
6251 } 6257 }
6252 6258
6253 void RenderFrameImpl::LoadDataURL( 6259 void RenderFrameImpl::LoadDataURL(
6254 const CommonNavigationParams& params, 6260 const CommonNavigationParams& params,
6255 const RequestNavigationParams& request_params, 6261 const RequestNavigationParams& request_params,
6256 WebLocalFrame* frame, 6262 WebLocalFrame* frame,
6257 blink::WebFrameLoadType load_type, 6263 blink::WebFrameLoadType load_type,
6258 blink::WebHistoryItem item_for_history_navigation, 6264 blink::WebHistoryItem item_for_history_navigation,
(...skipping 555 matching lines...) Expand 10 before | Expand all | Expand 10 after
6814 // event target. Potentially a Pepper plugin will receive the event. 6820 // event target. Potentially a Pepper plugin will receive the event.
6815 // In order to tell whether a plugin gets the last mouse event and which it 6821 // In order to tell whether a plugin gets the last mouse event and which it
6816 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6822 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6817 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6823 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6818 // |pepper_last_mouse_event_target_|. 6824 // |pepper_last_mouse_event_target_|.
6819 pepper_last_mouse_event_target_ = nullptr; 6825 pepper_last_mouse_event_target_ = nullptr;
6820 #endif 6826 #endif
6821 } 6827 }
6822 6828
6823 } // namespace content 6829 } // namespace content
OLDNEW
« no previous file with comments | « content/public/browser/navigation_handle.cc ('k') | content/renderer/render_view_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698