| 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/ui/browser_view_controller.h" | 5 #import "ios/chrome/browser/ui/browser_view_controller.h" |
| 6 | 6 |
| 7 #import <AssetsLibrary/AssetsLibrary.h> | 7 #import <AssetsLibrary/AssetsLibrary.h> |
| 8 #import <MobileCoreServices/MobileCoreServices.h> | 8 #import <MobileCoreServices/MobileCoreServices.h> |
| 9 #import <PassKit/PassKit.h> | 9 #import <PassKit/PassKit.h> |
| 10 #import <Photos/Photos.h> | 10 #import <Photos/Photos.h> |
| (...skipping 2966 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2977 NewTabPageController* pageController = | 2977 NewTabPageController* pageController = |
| 2978 [[NewTabPageController alloc] initWithUrl:url | 2978 [[NewTabPageController alloc] initWithUrl:url |
| 2979 loader:self | 2979 loader:self |
| 2980 focuser:_toolbarController | 2980 focuser:_toolbarController |
| 2981 ntpObserver:self | 2981 ntpObserver:self |
| 2982 browserState:_browserState | 2982 browserState:_browserState |
| 2983 colorCache:_dominantColorCache | 2983 colorCache:_dominantColorCache |
| 2984 webToolbarDelegate:self | 2984 webToolbarDelegate:self |
| 2985 tabModel:_model]; | 2985 tabModel:_model]; |
| 2986 pageController.swipeRecognizerProvider = self.sideSwipeController; | 2986 pageController.swipeRecognizerProvider = self.sideSwipeController; |
| 2987 pageController.parentViewController = self; |
| 2987 | 2988 |
| 2988 // Panel is always NTP for iPhone. | 2989 // Panel is always NTP for iPhone. |
| 2989 NewTabPage::PanelIdentifier panelType = NewTabPage::kMostVisitedPanel; | 2990 NewTabPage::PanelIdentifier panelType = NewTabPage::kMostVisitedPanel; |
| 2990 | 2991 |
| 2991 if (IsIPadIdiom()) { | 2992 if (IsIPadIdiom()) { |
| 2992 // New Tab Page can have multiple panels. Each panel is addressable | 2993 // New Tab Page can have multiple panels. Each panel is addressable |
| 2993 // by a #fragment, e.g. chrome://newtab/#most_visited takes user to | 2994 // by a #fragment, e.g. chrome://newtab/#most_visited takes user to |
| 2994 // the Most Visited page, chrome://newtab/#bookmarks takes user to | 2995 // the Most Visited page, chrome://newtab/#bookmarks takes user to |
| 2995 // the Bookmark Manager, etc. | 2996 // the Bookmark Manager, etc. |
| 2996 // The utility functions NewTabPage::IdentifierFromFragment() and | 2997 // The utility functions NewTabPage::IdentifierFromFragment() and |
| (...skipping 2134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5131 | 5132 |
| 5132 - (UIView*)voiceSearchButton { | 5133 - (UIView*)voiceSearchButton { |
| 5133 return _voiceSearchButton; | 5134 return _voiceSearchButton; |
| 5134 } | 5135 } |
| 5135 | 5136 |
| 5136 - (id<LogoAnimationControllerOwner>)logoAnimationControllerOwner { | 5137 - (id<LogoAnimationControllerOwner>)logoAnimationControllerOwner { |
| 5137 return [self currentLogoAnimationControllerOwner]; | 5138 return [self currentLogoAnimationControllerOwner]; |
| 5138 } | 5139 } |
| 5139 | 5140 |
| 5140 @end | 5141 @end |
| OLD | NEW |