Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(259)

Side by Side Diff: ios/chrome/browser/ui/browser_view_controller.mm

Issue 2820063003: Fix NTP parentViewController. (Closed)
Patch Set: Fix tests Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | ios/chrome/browser/ui/ntp/new_tab_page_controller.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 3016 matching lines...) Expand 10 before | Expand all | Expand 10 after
3027 std::string url_host = url.host(); 3027 std::string url_host = url.host();
3028 if (url_host == kChromeUINewTabHost || url_host == kChromeUIBookmarksHost) { 3028 if (url_host == kChromeUINewTabHost || url_host == kChromeUIBookmarksHost) {
3029 NewTabPageController* pageController = 3029 NewTabPageController* pageController =
3030 [[NewTabPageController alloc] initWithUrl:url 3030 [[NewTabPageController alloc] initWithUrl:url
3031 loader:self 3031 loader:self
3032 focuser:_toolbarController 3032 focuser:_toolbarController
3033 ntpObserver:self 3033 ntpObserver:self
3034 browserState:_browserState 3034 browserState:_browserState
3035 colorCache:_dominantColorCache 3035 colorCache:_dominantColorCache
3036 webToolbarDelegate:self 3036 webToolbarDelegate:self
3037 tabModel:_model]; 3037 tabModel:_model
3038 parentViewController:self];
3038 pageController.swipeRecognizerProvider = self.sideSwipeController; 3039 pageController.swipeRecognizerProvider = self.sideSwipeController;
3039 pageController.parentViewController = self;
3040 3040
3041 // Panel is always NTP for iPhone. 3041 // Panel is always NTP for iPhone.
3042 NewTabPage::PanelIdentifier panelType = NewTabPage::kMostVisitedPanel; 3042 NewTabPage::PanelIdentifier panelType = NewTabPage::kMostVisitedPanel;
3043 3043
3044 if (IsIPadIdiom()) { 3044 if (IsIPadIdiom()) {
3045 // New Tab Page can have multiple panels. Each panel is addressable 3045 // New Tab Page can have multiple panels. Each panel is addressable
3046 // by a #fragment, e.g. chrome://newtab/#most_visited takes user to 3046 // by a #fragment, e.g. chrome://newtab/#most_visited takes user to
3047 // the Most Visited page, chrome://newtab/#bookmarks takes user to 3047 // the Most Visited page, chrome://newtab/#bookmarks takes user to
3048 // the Bookmark Manager, etc. 3048 // the Bookmark Manager, etc.
3049 // The utility functions NewTabPage::IdentifierFromFragment() and 3049 // The utility functions NewTabPage::IdentifierFromFragment() and
(...skipping 2124 matching lines...) Expand 10 before | Expand all | Expand 10 after
5174 5174
5175 - (UIView*)voiceSearchButton { 5175 - (UIView*)voiceSearchButton {
5176 return _voiceSearchButton; 5176 return _voiceSearchButton;
5177 } 5177 }
5178 5178
5179 - (id<LogoAnimationControllerOwner>)logoAnimationControllerOwner { 5179 - (id<LogoAnimationControllerOwner>)logoAnimationControllerOwner {
5180 return [self currentLogoAnimationControllerOwner]; 5180 return [self currentLogoAnimationControllerOwner];
5181 } 5181 }
5182 5182
5183 @end 5183 @end
OLDNEW
« no previous file with comments | « no previous file | ios/chrome/browser/ui/ntp/new_tab_page_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698