Chromium Code Reviews| Index: ios/chrome/browser/ui/toolbar/web_toolbar_controller.mm |
| diff --git a/ios/chrome/browser/ui/toolbar/web_toolbar_controller.mm b/ios/chrome/browser/ui/toolbar/web_toolbar_controller.mm |
| index 498ce10373c82bd852a07cccaedd1af53cb732c8..ee215e354a909ac338f9adc1e4f8f45749a95814 100644 |
| --- a/ios/chrome/browser/ui/toolbar/web_toolbar_controller.mm |
| +++ b/ios/chrome/browser/ui/toolbar/web_toolbar_controller.mm |
| @@ -805,7 +805,7 @@ - (UIImage*)snapshotWithWidth:(CGFloat)width { |
| } |
| - (void)showTabHistoryPopupInView:(UIView*)view |
| - withSessionEntries:(NSArray*)sessionEntries |
| + withItems:(const web::NavigationItemList&)items |
| forBackHistory:(BOOL)isBackHistory { |
| if (_tabHistoryPopupController) |
| return; |
| @@ -826,9 +826,15 @@ - (void)showTabHistoryPopupInView:(UIView*)view |
| _tabHistoryPopupController.reset([[TabHistoryPopupController alloc] |
| initWithOrigin:convertedOrigin |
| parentView:view |
| - entries:sessionEntries]); |
| + items:items]); |
| [_tabHistoryPopupController setDelegate:self]; |
| + // Fade in the popup and notify observers. |
| + CGRect containerFrame = [[_tabHistoryPopupController popupContainer] frame]; |
|
kkhorimoto
2017/02/14 22:46:50
This was moved from TabHistoryPopupController's in
|
| + CGPoint destination = CGPointMake(CGRectGetLeadingEdge(containerFrame), |
| + CGRectGetMinY(containerFrame)); |
| + [_tabHistoryPopupController fadeInPopupFromSource:convertedOrigin |
| + toDestination:destination]; |
| [[NSNotificationCenter defaultCenter] |
| postNotificationName:kTabHistoryPopupWillShowNotification |
| object:nil]; |