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

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

Issue 2339673002: Do not clear the favicon for an in-page navigation. (Closed)
Patch Set: test! 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 | « no previous file | content/browser/frame_host/navigation_controller_impl_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 /* 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 1194 matching lines...) Expand 10 before | Expand all | Expand 10 after
1205 // Update the existing FrameNavigationEntry to ensure all of its members 1205 // Update the existing FrameNavigationEntry to ensure all of its members
1206 // reflect the parameters coming from the renderer process. 1206 // reflect the parameters coming from the renderer process.
1207 entry->AddOrUpdateFrameEntry( 1207 entry->AddOrUpdateFrameEntry(
1208 rfh->frame_tree_node(), params.item_sequence_number, 1208 rfh->frame_tree_node(), params.item_sequence_number,
1209 params.document_sequence_number, rfh->GetSiteInstance(), nullptr, 1209 params.document_sequence_number, rfh->GetSiteInstance(), nullptr,
1210 params.url, params.referrer, params.page_state, params.method, 1210 params.url, params.referrer, params.page_state, params.method,
1211 params.post_id); 1211 params.post_id);
1212 1212
1213 // The redirected to page should not inherit the favicon from the previous 1213 // The redirected to page should not inherit the favicon from the previous
1214 // page. 1214 // page.
1215 if (ui::PageTransitionIsRedirect(params.transition)) 1215 if (ui::PageTransitionIsRedirect(params.transition) && !is_in_page)
1216 entry->GetFavicon() = FaviconStatus(); 1216 entry->GetFavicon() = FaviconStatus();
1217 1217
1218 // The entry we found in the list might be pending if the user hit 1218 // The entry we found in the list might be pending if the user hit
1219 // back/forward/reload. This load should commit it (since it's already in the 1219 // back/forward/reload. This load should commit it (since it's already in the
1220 // list, we can just discard the pending pointer). We should also discard the 1220 // list, we can just discard the pending pointer). We should also discard the
1221 // pending entry if it corresponds to a different navigation, since that one 1221 // pending entry if it corresponds to a different navigation, since that one
1222 // is now likely canceled. If it is not canceled, we will treat it as a new 1222 // is now likely canceled. If it is not canceled, we will treat it as a new
1223 // navigation when it arrives, which is also ok. 1223 // navigation when it arrives, which is also ok.
1224 // 1224 //
1225 // Note that we need to use the "internal" version since we don't want to 1225 // Note that we need to use the "internal" version since we don't want to
(...skipping 875 matching lines...) Expand 10 before | Expand all | Expand 10 after
2101 } 2101 }
2102 } 2102 }
2103 } 2103 }
2104 2104
2105 void NavigationControllerImpl::SetGetTimestampCallbackForTest( 2105 void NavigationControllerImpl::SetGetTimestampCallbackForTest(
2106 const base::Callback<base::Time()>& get_timestamp_callback) { 2106 const base::Callback<base::Time()>& get_timestamp_callback) {
2107 get_timestamp_callback_ = get_timestamp_callback; 2107 get_timestamp_callback_ = get_timestamp_callback;
2108 } 2108 }
2109 2109
2110 } // namespace content 2110 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/frame_host/navigation_controller_impl_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698