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

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

Issue 2294343002: Update FrameNavigationEntry members when setting PageState. (Closed)
Patch Set: Remove NOTREACHED, as unit tests are failing. Created 4 years, 3 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/frame_host/navigation_entry_impl.cc ('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 4518 matching lines...) Expand 10 before | Expand all | Expand 10 after
4529 if (!DecodePageState(page_state.ToEncodedData(), &exploded_state)) 4529 if (!DecodePageState(page_state.ToEncodedData(), &exploded_state))
4530 return; 4530 return;
4531 4531
4532 if (exploded_state.top.document_sequence_number != 4532 if (exploded_state.top.document_sequence_number !=
4533 frame_entry->document_sequence_number() || 4533 frame_entry->document_sequence_number() ||
4534 exploded_state.top.item_sequence_number != 4534 exploded_state.top.item_sequence_number !=
4535 frame_entry->item_sequence_number()) { 4535 frame_entry->item_sequence_number()) {
4536 return; 4536 return;
4537 } 4537 }
4538 4538
4539 frame_entry->set_page_state(page_state); 4539 frame_entry->SetPageState(page_state);
4540 controller_.NotifyEntryChanged(entry); 4540 controller_.NotifyEntryChanged(entry);
4541 } 4541 }
4542 4542
4543 void WebContentsImpl::UpdateTitle(RenderFrameHost* render_frame_host, 4543 void WebContentsImpl::UpdateTitle(RenderFrameHost* render_frame_host,
4544 int32_t page_id, 4544 int32_t page_id,
4545 const base::string16& title, 4545 const base::string16& title,
4546 base::i18n::TextDirection title_direction) { 4546 base::i18n::TextDirection title_direction) {
4547 // If we have a title, that's a pretty good indication that we've started 4547 // If we have a title, that's a pretty good indication that we've started
4548 // getting useful data. 4548 // getting useful data.
4549 SetNotWaitingForResponse(); 4549 SetNotWaitingForResponse();
(...skipping 663 matching lines...) Expand 10 before | Expand all | Expand 10 after
5213 for (RenderViewHost* render_view_host : render_view_host_set) 5213 for (RenderViewHost* render_view_host : render_view_host_set)
5214 render_view_host->OnWebkitPreferencesChanged(); 5214 render_view_host->OnWebkitPreferencesChanged();
5215 } 5215 }
5216 5216
5217 void WebContentsImpl::SetJavaScriptDialogManagerForTesting( 5217 void WebContentsImpl::SetJavaScriptDialogManagerForTesting(
5218 JavaScriptDialogManager* dialog_manager) { 5218 JavaScriptDialogManager* dialog_manager) {
5219 dialog_manager_ = dialog_manager; 5219 dialog_manager_ = dialog_manager;
5220 } 5220 }
5221 5221
5222 } // namespace content 5222 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/navigation_entry_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698