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

Side by Side Diff: content/browser/frame_host/navigation_controller_impl.cc

Issue 2275643003: Notify about PageState changes after an AUTO_SUBFRAME commit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Switch to ASSERT_TRUE. 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
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 /* 5 /*
6 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 6 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
7 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 7 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
9 * (http://www.torchmobile.com/) 9 * (http://www.torchmobile.com/)
10 * 10 *
(...skipping 817 matching lines...) Expand 10 before | Expand all | Expand 10 after
828 RendererDidNavigateToExistingPage(rfh, params); 828 RendererDidNavigateToExistingPage(rfh, params);
829 break; 829 break;
830 case NAVIGATION_TYPE_SAME_PAGE: 830 case NAVIGATION_TYPE_SAME_PAGE:
831 RendererDidNavigateToSamePage(rfh, params); 831 RendererDidNavigateToSamePage(rfh, params);
832 break; 832 break;
833 case NAVIGATION_TYPE_NEW_SUBFRAME: 833 case NAVIGATION_TYPE_NEW_SUBFRAME:
834 RendererDidNavigateNewSubframe(rfh, params, details->is_in_page, 834 RendererDidNavigateNewSubframe(rfh, params, details->is_in_page,
835 details->did_replace_entry); 835 details->did_replace_entry);
836 break; 836 break;
837 case NAVIGATION_TYPE_AUTO_SUBFRAME: 837 case NAVIGATION_TYPE_AUTO_SUBFRAME:
838 if (!RendererDidNavigateAutoSubframe(rfh, params)) 838 if (!RendererDidNavigateAutoSubframe(rfh, params)) {
839 // In UseSubframeNavigationEntries mode, we won't send a notification
840 // about auto-subframe PageState during UpdateStateForFrame, since it
841 // looks like nothing has changed. Send it here at commit time instead.
842 if (SiteIsolationPolicy::UseSubframeNavigationEntries())
843 NotifyEntryChanged(GetLastCommittedEntry());
839 return false; 844 return false;
845 }
840 break; 846 break;
841 case NAVIGATION_TYPE_NAV_IGNORE: 847 case NAVIGATION_TYPE_NAV_IGNORE:
842 // If a pending navigation was in progress, this canceled it. We should 848 // If a pending navigation was in progress, this canceled it. We should
843 // discard it and make sure it is removed from the URL bar. After that, 849 // discard it and make sure it is removed from the URL bar. After that,
844 // there is nothing we can do with this navigation, so we just return to 850 // there is nothing we can do with this navigation, so we just return to
845 // the caller that nothing has happened. 851 // the caller that nothing has happened.
846 if (pending_entry_) { 852 if (pending_entry_) {
847 DiscardNonCommittedEntries(); 853 DiscardNonCommittedEntries();
848 delegate_->NotifyNavigationStateChanged(INVALIDATE_TYPE_URL); 854 delegate_->NotifyNavigationStateChanged(INVALIDATE_TYPE_URL);
849 } 855 }
(...skipping 1251 matching lines...) Expand 10 before | Expand all | Expand 10 after
2101 } 2107 }
2102 } 2108 }
2103 } 2109 }
2104 2110
2105 void NavigationControllerImpl::SetGetTimestampCallbackForTest( 2111 void NavigationControllerImpl::SetGetTimestampCallbackForTest(
2106 const base::Callback<base::Time()>& get_timestamp_callback) { 2112 const base::Callback<base::Time()>& get_timestamp_callback) {
2107 get_timestamp_callback_ = get_timestamp_callback; 2113 get_timestamp_callback_ = get_timestamp_callback;
2108 } 2114 }
2109 2115
2110 } // namespace content 2116 } // namespace content
OLDNEW
« no previous file with comments | « chrome/test/data/iframe_blank.html ('k') | content/browser/frame_host/navigation_controller_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698