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

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

Issue 2657323003: Convert HistoryTabHelper to use the new navigation callbacks. (Closed)
Patch Set: better fix to send this data from the renderer initially 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 3438 matching lines...) Expand 10 before | Expand all | Expand 10 after
3449 3449
3450 base::TimeTicks navigation_start = 3450 base::TimeTicks navigation_start =
3451 navigation_state->common_params().navigation_start; 3451 navigation_state->common_params().navigation_start;
3452 DCHECK(!navigation_start.is_null()); 3452 DCHECK(!navigation_start.is_null());
3453 3453
3454 for (auto& observer : render_view_->observers()) 3454 for (auto& observer : render_view_->observers())
3455 observer.DidStartProvisionalLoad(frame); 3455 observer.DidStartProvisionalLoad(frame);
3456 for (auto& observer : observers_) 3456 for (auto& observer : observers_)
3457 observer.DidStartProvisionalLoad(); 3457 observer.DidStartProvisionalLoad();
3458 3458
3459 std::vector<GURL> redirect_chain;
3460 GetRedirectChain(ds, &redirect_chain);
3461 CHECK(!redirect_chain.empty());
3459 Send(new FrameHostMsg_DidStartProvisionalLoad( 3462 Send(new FrameHostMsg_DidStartProvisionalLoad(
3460 routing_id_, ds->getRequest().url(), navigation_start)); 3463 routing_id_, ds->getRequest().url(), redirect_chain, navigation_start));
3461 } 3464 }
3462 3465
3463 void RenderFrameImpl::didReceiveServerRedirectForProvisionalLoad( 3466 void RenderFrameImpl::didReceiveServerRedirectForProvisionalLoad(
3464 blink::WebLocalFrame* frame) { 3467 blink::WebLocalFrame* frame) {
3465 DCHECK_EQ(frame_, frame); 3468 DCHECK_EQ(frame_, frame);
3466 3469
3467 // TODO(creis): Determine if this can be removed or if we need to clear any 3470 // TODO(creis): Determine if this can be removed or if we need to clear any
3468 // local state here to fix https://crbug.com/671276. 3471 // local state here to fix https://crbug.com/671276.
3469 } 3472 }
3470 3473
(...skipping 2757 matching lines...) Expand 10 before | Expand all | Expand 10 after
6228 initiator_origin); 6231 initiator_origin);
6229 6232
6230 if (!info.form.isNull()) { 6233 if (!info.form.isNull()) {
6231 WebSearchableFormData web_searchable_form_data(info.form); 6234 WebSearchableFormData web_searchable_form_data(info.form);
6232 begin_navigation_params.searchable_form_url = 6235 begin_navigation_params.searchable_form_url =
6233 web_searchable_form_data.url(); 6236 web_searchable_form_data.url();
6234 begin_navigation_params.searchable_form_encoding = 6237 begin_navigation_params.searchable_form_encoding =
6235 web_searchable_form_data.encoding().utf8(); 6238 web_searchable_form_data.encoding().utf8();
6236 } 6239 }
6237 6240
6241 if (info.isClientRedirect)
6242 begin_navigation_params.client_side_redirect_url = frame_->document().url();
6243
6238 Send(new FrameHostMsg_BeginNavigation( 6244 Send(new FrameHostMsg_BeginNavigation(
6239 routing_id_, MakeCommonNavigationParams(info), begin_navigation_params)); 6245 routing_id_, MakeCommonNavigationParams(info), begin_navigation_params));
6240 } 6246 }
6241 6247
6242 void RenderFrameImpl::LoadDataURL( 6248 void RenderFrameImpl::LoadDataURL(
6243 const CommonNavigationParams& params, 6249 const CommonNavigationParams& params,
6244 const RequestNavigationParams& request_params, 6250 const RequestNavigationParams& request_params,
6245 WebLocalFrame* frame, 6251 WebLocalFrame* frame,
6246 blink::WebFrameLoadType load_type, 6252 blink::WebFrameLoadType load_type,
6247 blink::WebHistoryItem item_for_history_navigation, 6253 blink::WebHistoryItem item_for_history_navigation,
(...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after
6796 // event target. Potentially a Pepper plugin will receive the event. 6802 // event target. Potentially a Pepper plugin will receive the event.
6797 // In order to tell whether a plugin gets the last mouse event and which it 6803 // In order to tell whether a plugin gets the last mouse event and which it
6798 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6804 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6799 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6805 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6800 // |pepper_last_mouse_event_target_|. 6806 // |pepper_last_mouse_event_target_|.
6801 pepper_last_mouse_event_target_ = nullptr; 6807 pepper_last_mouse_event_target_ = nullptr;
6802 #endif 6808 #endif
6803 } 6809 }
6804 6810
6805 } // namespace content 6811 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698