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

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: comment nit 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
« no previous file with comments | « content/common/view_messages.h ('k') | content/renderer/render_view_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 3560 matching lines...) Expand 10 before | Expand all | Expand 10 after
3571 if (request_params.nav_entry_id != 0 && 3571 if (request_params.nav_entry_id != 0 &&
3572 !request_params.intended_as_new_entry) { 3572 !request_params.intended_as_new_entry) {
3573 // This is a successful session history navigation! 3573 // This is a successful session history navigation!
3574 render_view_->page_id_ = request_params.page_id; 3574 render_view_->page_id_ = request_params.page_id;
3575 3575
3576 render_view_->history_list_offset_ = 3576 render_view_->history_list_offset_ =
3577 request_params.pending_history_list_offset; 3577 request_params.pending_history_list_offset;
3578 } 3578 }
3579 } 3579 }
3580 3580
3581 bool sent = Send(
3582 new FrameHostMsg_DidAssignPageId(routing_id_, render_view_->page_id_));
3583 CHECK(sent); // http://crbug.com/407376
3584
3585 FOR_EACH_OBSERVER(RenderViewObserver, render_view_->observers_, 3581 FOR_EACH_OBSERVER(RenderViewObserver, render_view_->observers_,
3586 DidCommitProvisionalLoad(frame, is_new_navigation)); 3582 DidCommitProvisionalLoad(frame, is_new_navigation));
3587 FOR_EACH_OBSERVER( 3583 FOR_EACH_OBSERVER(
3588 RenderFrameObserver, observers_, 3584 RenderFrameObserver, observers_,
3589 DidCommitProvisionalLoad(is_new_navigation, 3585 DidCommitProvisionalLoad(is_new_navigation,
3590 navigation_state->WasWithinSamePage())); 3586 navigation_state->WasWithinSamePage()));
3591 3587
3592 if (!frame->parent()) { // Only for top frames. 3588 if (!frame->parent()) { // Only for top frames.
3593 RenderThreadImpl* render_thread_impl = RenderThreadImpl::current(); 3589 RenderThreadImpl* render_thread_impl = RenderThreadImpl::current();
3594 if (render_thread_impl) { // Can be NULL in tests. 3590 if (render_thread_impl) { // Can be NULL in tests.
(...skipping 2943 matching lines...) Expand 10 before | Expand all | Expand 10 after
6538 // event target. Potentially a Pepper plugin will receive the event. 6534 // event target. Potentially a Pepper plugin will receive the event.
6539 // In order to tell whether a plugin gets the last mouse event and which it 6535 // In order to tell whether a plugin gets the last mouse event and which it
6540 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6536 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6541 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6537 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6542 // |pepper_last_mouse_event_target_|. 6538 // |pepper_last_mouse_event_target_|.
6543 pepper_last_mouse_event_target_ = nullptr; 6539 pepper_last_mouse_event_target_ = nullptr;
6544 #endif 6540 #endif
6545 } 6541 }
6546 6542
6547 } // namespace content 6543 } // namespace content
OLDNEW
« no previous file with comments | « content/common/view_messages.h ('k') | content/renderer/render_view_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698