OLD | NEW |
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 1359 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1370 DCHECK([self navigationManager]); | 1370 DCHECK([self navigationManager]); |
1371 [self navigationManager]->DiscardNonCommittedItems(); | 1371 [self navigationManager]->DiscardNonCommittedItems(); |
1372 // Ensure the UI reflects the current entry, not the just-discarded pending | 1372 // Ensure the UI reflects the current entry, not the just-discarded pending |
1373 // entry. | 1373 // entry. |
1374 [parentTabModel_ notifyTabChanged:self]; | 1374 [parentTabModel_ notifyTabChanged:self]; |
1375 return YES; | 1375 return YES; |
1376 } | 1376 } |
1377 return NO; | 1377 return NO; |
1378 } | 1378 } |
1379 | 1379 |
1380 - (void)webWillFinishHistoryNavigationFromEntry:(CRWSessionEntry*)fromEntry { | 1380 - (void)webWillFinishHistoryNavigation { |
1381 [parentTabModel_ notifyTabChanged:self]; | 1381 [parentTabModel_ notifyTabChanged:self]; |
1382 } | 1382 } |
1383 | 1383 |
1384 - (void)webState:(web::WebState*)webState | 1384 - (void)webState:(web::WebState*)webState |
1385 didFinishNavigation:(web::NavigationContext*)navigation { | 1385 didFinishNavigation:(web::NavigationContext*)navigation { |
1386 if (navigation->IsSamePage()) { | 1386 if (navigation->IsSamePage()) { |
1387 auto* faviconDriver = favicon::WebFaviconDriver::FromWebState(webState); | 1387 auto* faviconDriver = favicon::WebFaviconDriver::FromWebState(webState); |
1388 if (faviconDriver) { | 1388 if (faviconDriver) { |
1389 // Fetch the favicon for the new URL. | 1389 // Fetch the favicon for the new URL. |
1390 faviconDriver->FetchFavicon(navigation->GetUrl()); | 1390 faviconDriver->FetchFavicon(navigation->GetUrl()); |
(...skipping 826 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2217 | 2217 |
2218 - (TabModel*)parentTabModel { | 2218 - (TabModel*)parentTabModel { |
2219 return parentTabModel_; | 2219 return parentTabModel_; |
2220 } | 2220 } |
2221 | 2221 |
2222 - (FormInputAccessoryViewController*)inputAccessoryViewController { | 2222 - (FormInputAccessoryViewController*)inputAccessoryViewController { |
2223 return inputAccessoryViewController_.get(); | 2223 return inputAccessoryViewController_.get(); |
2224 } | 2224 } |
2225 | 2225 |
2226 @end | 2226 @end |
OLD | NEW |