| 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 1376 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1387 } | 1387 } |
| 1388 return NO; | 1388 return NO; |
| 1389 } | 1389 } |
| 1390 | 1390 |
| 1391 - (void)webWillFinishHistoryNavigationFromEntry:(CRWSessionEntry*)fromEntry { | 1391 - (void)webWillFinishHistoryNavigationFromEntry:(CRWSessionEntry*)fromEntry { |
| 1392 [parentTabModel_ notifyTabChanged:self]; | 1392 [parentTabModel_ notifyTabChanged:self]; |
| 1393 } | 1393 } |
| 1394 | 1394 |
| 1395 - (void)webState:(web::WebState*)webState | 1395 - (void)webState:(web::WebState*)webState |
| 1396 didFinishNavigation:(web::NavigationContext*)navigation { | 1396 didFinishNavigation:(web::NavigationContext*)navigation { |
| 1397 if (navigation->IsSamePage()) { | 1397 if (navigation->IsSameDocument()) { |
| 1398 auto* faviconDriver = favicon::WebFaviconDriver::FromWebState(webState); | 1398 auto* faviconDriver = favicon::WebFaviconDriver::FromWebState(webState); |
| 1399 if (faviconDriver) { | 1399 if (faviconDriver) { |
| 1400 // Fetch the favicon for the new URL. | 1400 // Fetch the favicon for the new URL. |
| 1401 faviconDriver->FetchFavicon(navigation->GetUrl()); | 1401 faviconDriver->FetchFavicon(navigation->GetUrl()); |
| 1402 } | 1402 } |
| 1403 } | 1403 } |
| 1404 | 1404 |
| 1405 if (!navigation->IsErrorPage()) { | 1405 if (!navigation->IsErrorPage()) { |
| 1406 [self addCurrentEntryToHistoryDB]; | 1406 [self addCurrentEntryToHistoryDB]; |
| 1407 [self countMainFrameLoad]; | 1407 [self countMainFrameLoad]; |
| (...skipping 827 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2235 | 2235 |
| 2236 - (TabModel*)parentTabModel { | 2236 - (TabModel*)parentTabModel { |
| 2237 return parentTabModel_; | 2237 return parentTabModel_; |
| 2238 } | 2238 } |
| 2239 | 2239 |
| 2240 - (FormInputAccessoryViewController*)inputAccessoryViewController { | 2240 - (FormInputAccessoryViewController*)inputAccessoryViewController { |
| 2241 return inputAccessoryViewController_.get(); | 2241 return inputAccessoryViewController_.get(); |
| 2242 } | 2242 } |
| 2243 | 2243 |
| 2244 @end | 2244 @end |
| OLD | NEW |