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

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

Issue 1258273006: Remove page id from title and state updating. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@switch
Patch Set: one last rebase Created 4 years, 2 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 3562 matching lines...) Expand 10 before | Expand all | Expand 10 after
3573 if (request_params.nav_entry_id != 0 && 3573 if (request_params.nav_entry_id != 0 &&
3574 !request_params.intended_as_new_entry) { 3574 !request_params.intended_as_new_entry) {
3575 // This is a successful session history navigation! 3575 // This is a successful session history navigation!
3576 render_view_->page_id_ = request_params.page_id; 3576 render_view_->page_id_ = request_params.page_id;
3577 3577
3578 render_view_->history_list_offset_ = 3578 render_view_->history_list_offset_ =
3579 request_params.pending_history_list_offset; 3579 request_params.pending_history_list_offset;
3580 } 3580 }
3581 } 3581 }
3582 3582
3583 bool sent = Send(
3584 new FrameHostMsg_DidAssignPageId(routing_id_, render_view_->page_id_));
3585 CHECK(sent); // http://crbug.com/407376
3586
3587 FOR_EACH_OBSERVER(RenderViewObserver, render_view_->observers_, 3583 FOR_EACH_OBSERVER(RenderViewObserver, render_view_->observers_,
3588 DidCommitProvisionalLoad(frame, is_new_navigation)); 3584 DidCommitProvisionalLoad(frame, is_new_navigation));
3589 FOR_EACH_OBSERVER( 3585 FOR_EACH_OBSERVER(
3590 RenderFrameObserver, observers_, 3586 RenderFrameObserver, observers_,
3591 DidCommitProvisionalLoad(is_new_navigation, 3587 DidCommitProvisionalLoad(is_new_navigation,
3592 navigation_state->WasWithinSamePage())); 3588 navigation_state->WasWithinSamePage()));
3593 3589
3594 if (!frame->parent()) { // Only for top frames. 3590 if (!frame->parent()) { // Only for top frames.
3595 RenderThreadImpl* render_thread_impl = RenderThreadImpl::current(); 3591 RenderThreadImpl* render_thread_impl = RenderThreadImpl::current();
3596 if (render_thread_impl) { // Can be NULL in tests. 3592 if (render_thread_impl) { // Can be NULL in tests.
(...skipping 2943 matching lines...) Expand 10 before | Expand all | Expand 10 after
6540 // event target. Potentially a Pepper plugin will receive the event. 6536 // event target. Potentially a Pepper plugin will receive the event.
6541 // In order to tell whether a plugin gets the last mouse event and which it 6537 // In order to tell whether a plugin gets the last mouse event and which it
6542 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6538 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6543 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6539 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6544 // |pepper_last_mouse_event_target_|. 6540 // |pepper_last_mouse_event_target_|.
6545 pepper_last_mouse_event_target_ = nullptr; 6541 pepper_last_mouse_event_target_ = nullptr;
6546 #endif 6542 #endif
6547 } 6543 }
6548 6544
6549 } // namespace content 6545 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698