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

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

Issue 2588913002: EarlGrey tests for Payment Request (base CL) (Closed)
Patch Set: Addressed comments by jdonnelly@ Created 3 years, 11 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
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 1765 matching lines...) Expand 10 before | Expand all | Expand 10 after
1776 _contextualSearchPanel = [self createPanelView]; 1776 _contextualSearchPanel = [self createPanelView];
1777 [self.view insertSubview:_contextualSearchPanel 1777 [self.view insertSubview:_contextualSearchPanel
1778 aboveSubview:[_toolbarController view]]; 1778 aboveSubview:[_toolbarController view]];
1779 _contextualSearchController.reset([[ContextualSearchController alloc] 1779 _contextualSearchController.reset([[ContextualSearchController alloc]
1780 initWithBrowserState:_browserState 1780 initWithBrowserState:_browserState
1781 delegate:self]); 1781 delegate:self]);
1782 [_contextualSearchController setPanel:_contextualSearchPanel]; 1782 [_contextualSearchController setPanel:_contextualSearchPanel];
1783 [_contextualSearchController setTab:[_model currentTab]]; 1783 [_contextualSearchController setTab:[_model currentTab]];
1784 } 1784 }
1785 1785
1786 if (experimental_flags::IsPaymentRequestEnabled()) { 1786 _paymentRequestManager.reset([[PaymentRequestManager alloc]
1787 _paymentRequestManager.reset([[PaymentRequestManager alloc] 1787 initWithBaseViewController:self
1788 initWithBaseViewController:self 1788 browserState:_browserState]);
1789 browserState:_browserState]); 1789 [_paymentRequestManager setWebState:[_model currentTab].webState];
1790 [_paymentRequestManager setWebState:[_model currentTab].webState];
1791 }
1792 } 1790 }
1793 1791
1794 // Set the frame for the various views. View must be loaded. 1792 // Set the frame for the various views. View must be loaded.
1795 - (void)setUpViewLayout { 1793 - (void)setUpViewLayout {
1796 DCHECK([self isViewLoaded]); 1794 DCHECK([self isViewLoaded]);
1797 1795
1798 CGFloat widthOfView = CGRectGetWidth([self view].bounds); 1796 CGFloat widthOfView = CGRectGetWidth([self view].bounds);
1799 1797
1800 CGFloat minY = [self headerOffset]; 1798 CGFloat minY = [self headerOffset];
1801 1799
(...skipping 3295 matching lines...) Expand 10 before | Expand all | Expand 10 after
5097 5095
5098 - (UIView*)voiceSearchButton { 5096 - (UIView*)voiceSearchButton {
5099 return _voiceSearchButton; 5097 return _voiceSearchButton;
5100 } 5098 }
5101 5099
5102 - (id<LogoAnimationControllerOwner>)logoAnimationControllerOwner { 5100 - (id<LogoAnimationControllerOwner>)logoAnimationControllerOwner {
5103 return [self currentLogoAnimationControllerOwner]; 5101 return [self currentLogoAnimationControllerOwner];
5104 } 5102 }
5105 5103
5106 @end 5104 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698