| 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 1339 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1350 DCHECK([self navigationManager]); | 1350 DCHECK([self navigationManager]); |
| 1351 [[self navigationManager]->GetSessionController() discardNonCommittedItems]; | 1351 [[self navigationManager]->GetSessionController() discardNonCommittedItems]; |
| 1352 // Ensure the UI reflects the current entry, not the just-discarded pending | 1352 // Ensure the UI reflects the current entry, not the just-discarded pending |
| 1353 // entry. | 1353 // entry. |
| 1354 [parentTabModel_ notifyTabChanged:self]; | 1354 [parentTabModel_ notifyTabChanged:self]; |
| 1355 return YES; | 1355 return YES; |
| 1356 } | 1356 } |
| 1357 return NO; | 1357 return NO; |
| 1358 } | 1358 } |
| 1359 | 1359 |
| 1360 - (void)webWillFinishHistoryNavigationFromEntry:(CRWSessionEntry*)fromEntry { | 1360 - (void)webWillFinishHistoryNavigation { |
| 1361 [parentTabModel_ notifyTabChanged:self]; | 1361 [parentTabModel_ notifyTabChanged:self]; |
| 1362 } | 1362 } |
| 1363 | 1363 |
| 1364 - (void)webDidUpdateHistoryStateWithPageURL:(const GURL&)pageUrl { | 1364 - (void)webDidUpdateHistoryStateWithPageURL:(const GURL&)pageUrl { |
| 1365 favicon::FaviconDriver* faviconDriver = | 1365 favicon::FaviconDriver* faviconDriver = |
| 1366 favicon::WebFaviconDriver::FromWebState(self.webState); | 1366 favicon::WebFaviconDriver::FromWebState(self.webState); |
| 1367 if (faviconDriver) { | 1367 if (faviconDriver) { |
| 1368 // Fetch the favicon for the new URL. | 1368 // Fetch the favicon for the new URL. |
| 1369 faviconDriver->FetchFavicon(pageUrl); | 1369 faviconDriver->FetchFavicon(pageUrl); |
| 1370 } | 1370 } |
| (...skipping 840 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2211 | 2211 |
| 2212 - (TabModel*)parentTabModel { | 2212 - (TabModel*)parentTabModel { |
| 2213 return parentTabModel_; | 2213 return parentTabModel_; |
| 2214 } | 2214 } |
| 2215 | 2215 |
| 2216 - (FormInputAccessoryViewController*)inputAccessoryViewController { | 2216 - (FormInputAccessoryViewController*)inputAccessoryViewController { |
| 2217 return inputAccessoryViewController_.get(); | 2217 return inputAccessoryViewController_.get(); |
| 2218 } | 2218 } |
| 2219 | 2219 |
| 2220 @end | 2220 @end |
| OLD | NEW |