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

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

Issue 2588913002: EarlGrey tests for Payment Request (base CL) (Closed)
Patch Set: Moved everything except the egtest upsream Created 4 years 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
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 1761 matching lines...) Expand 10 before | Expand all | Expand 10 after
1772 _contextualSearchPanel = [self createPanelView]; 1772 _contextualSearchPanel = [self createPanelView];
1773 [self.view insertSubview:_contextualSearchPanel 1773 [self.view insertSubview:_contextualSearchPanel
1774 aboveSubview:[_toolbarController view]]; 1774 aboveSubview:[_toolbarController view]];
1775 _contextualSearchController.reset([[ContextualSearchController alloc] 1775 _contextualSearchController.reset([[ContextualSearchController alloc]
1776 initWithBrowserState:_browserState 1776 initWithBrowserState:_browserState
1777 delegate:self]); 1777 delegate:self]);
1778 [_contextualSearchController setPanel:_contextualSearchPanel]; 1778 [_contextualSearchController setPanel:_contextualSearchPanel];
1779 [_contextualSearchController setTab:[_model currentTab]]; 1779 [_contextualSearchController setTab:[_model currentTab]];
1780 } 1780 }
1781 1781
1782 if (experimental_flags::IsPaymentRequestEnabled()) { 1782 _paymentRequestManager.reset([[PaymentRequestManager alloc]
1783 _paymentRequestManager.reset([[PaymentRequestManager alloc] 1783 initWithBaseViewController:self
1784 initWithBaseViewController:self 1784 browserState:_browserState]);
1785 browserState:_browserState]); 1785 [_paymentRequestManager setWebState:[_model currentTab].webState];
1786 [_paymentRequestManager setWebState:[_model currentTab].webState];
1787 }
1788 } 1786 }
1789 1787
1790 // Set the frame for the various views. View must be loaded. 1788 // Set the frame for the various views. View must be loaded.
1791 - (void)setUpViewLayout { 1789 - (void)setUpViewLayout {
1792 DCHECK([self isViewLoaded]); 1790 DCHECK([self isViewLoaded]);
1793 1791
1794 CGFloat widthOfView = CGRectGetWidth([self view].bounds); 1792 CGFloat widthOfView = CGRectGetWidth([self view].bounds);
1795 1793
1796 CGFloat minY = [self headerOffset]; 1794 CGFloat minY = [self headerOffset];
1797 1795
(...skipping 3316 matching lines...) Expand 10 before | Expand all | Expand 10 after
5114 5112
5115 - (UIView*)voiceSearchButton { 5113 - (UIView*)voiceSearchButton {
5116 return _voiceSearchButton; 5114 return _voiceSearchButton;
5117 } 5115 }
5118 5116
5119 - (id<LogoAnimationControllerOwner>)logoAnimationControllerOwner { 5117 - (id<LogoAnimationControllerOwner>)logoAnimationControllerOwner {
5120 return [self currentLogoAnimationControllerOwner]; 5118 return [self currentLogoAnimationControllerOwner];
5121 } 5119 }
5122 5120
5123 @end 5121 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698