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

Side by Side Diff: ios/chrome/browser/tabs/tab.mm

Issue 2759483002: Revert of Cleaned up old navigation code that did not use pending navigation item. (Closed)
Patch Set: Created 3 years, 9 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 #import "ios/chrome/browser/tabs/tab.h" 5 #import "ios/chrome/browser/tabs/tab.h"
6 6
7 #import <CoreLocation/CoreLocation.h> 7 #import <CoreLocation/CoreLocation.h>
8 #import <UIKit/UIKit.h> 8 #import <UIKit/UIKit.h>
9 9
10 #include <utility> 10 #include <utility>
(...skipping 1301 matching lines...) Expand 10 before | Expand all | Expand 10 after
1312 DCHECK([self navigationManager]); 1312 DCHECK([self navigationManager]);
1313 [self navigationManager]->DiscardNonCommittedItems(); 1313 [self navigationManager]->DiscardNonCommittedItems();
1314 // Ensure the UI reflects the current entry, not the just-discarded pending 1314 // Ensure the UI reflects the current entry, not the just-discarded pending
1315 // entry. 1315 // entry.
1316 [parentTabModel_ notifyTabChanged:self]; 1316 [parentTabModel_ notifyTabChanged:self];
1317 return YES; 1317 return YES;
1318 } 1318 }
1319 return NO; 1319 return NO;
1320 } 1320 }
1321 1321
1322 - (void)webWillFinishHistoryNavigation {
1323 [parentTabModel_ notifyTabChanged:self];
1324 }
1325
1322 - (void)webState:(web::WebState*)webState 1326 - (void)webState:(web::WebState*)webState
1323 didFinishNavigation:(web::NavigationContext*)navigation { 1327 didFinishNavigation:(web::NavigationContext*)navigation {
1324 if (navigation->IsSameDocument()) { 1328 if (navigation->IsSameDocument()) {
1325 auto* faviconDriver = favicon::WebFaviconDriver::FromWebState(webState); 1329 auto* faviconDriver = favicon::WebFaviconDriver::FromWebState(webState);
1326 if (faviconDriver) { 1330 if (faviconDriver) {
1327 // Fetch the favicon for the new URL. 1331 // Fetch the favicon for the new URL.
1328 faviconDriver->FetchFavicon(navigation->GetUrl()); 1332 faviconDriver->FetchFavicon(navigation->GetUrl());
1329 } 1333 }
1330 } 1334 }
1331 1335
(...skipping 768 matching lines...) Expand 10 before | Expand all | Expand 10 after
2100 2104
2101 - (TabModel*)parentTabModel { 2105 - (TabModel*)parentTabModel {
2102 return parentTabModel_; 2106 return parentTabModel_;
2103 } 2107 }
2104 2108
2105 - (FormInputAccessoryViewController*)inputAccessoryViewController { 2109 - (FormInputAccessoryViewController*)inputAccessoryViewController {
2106 return inputAccessoryViewController_.get(); 2110 return inputAccessoryViewController_.get();
2107 } 2111 }
2108 2112
2109 @end 2113 @end
OLDNEW
« no previous file with comments | « ios/chrome/browser/resources/Settings.bundle/Experimental.plist ('k') | ios/chrome/browser/web/visible_url_egtest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698