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

Side by Side Diff: ios/chrome/browser/ui/authentication/signin_account_selector_view_controller.mm

Issue 2942003002: [ios] Fix "return foo = nil" introduced by ARC conversion tools. (Closed)
Patch Set: Created 3 years, 6 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 #include "ios/chrome/browser/ui/authentication/signin_account_selector_view_cont roller.h" 5 #include "ios/chrome/browser/ui/authentication/signin_account_selector_view_cont roller.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #import "base/mac/foundation_util.h" 9 #import "base/mac/foundation_util.h"
10 #import "ios/chrome/browser/signin/chrome_identity_service_observer_bridge.h" 10 #import "ios/chrome/browser/signin/chrome_identity_service_observer_bridge.h"
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 @"divider" : divider, 124 @"divider" : divider,
125 @"v1" : layoutGuide1, 125 @"v1" : layoutGuide1,
126 @"v2" : layoutGuide2 126 @"v2" : layoutGuide2
127 }; 127 };
128 NSArray* constraints = @[ 128 NSArray* constraints = @[
129 @"V:[title]-(16)-[divider(==1)]|", 129 @"V:[title]-(16)-[divider(==1)]|",
130 @"H:|[v1(16)][title(<=440)][v2(>=v1)]|", 130 @"H:|[v1(16)][title(<=440)][v2(>=v1)]|",
131 @"H:|[divider]|", 131 @"H:|[divider]|",
132 ]; 132 ];
133 ApplyVisualConstraints(constraints, views); 133 ApplyVisualConstraints(constraints, views);
134 return contentView = nil; 134 return contentView;
135 } 135 }
136 136
137 - (void)viewWillLayoutSubviews { 137 - (void)viewWillLayoutSubviews {
138 CGSize viewSize = self.view.bounds.size; 138 CGSize viewSize = self.view.bounds.size;
139 MDCFlexibleHeaderView* headerView = 139 MDCFlexibleHeaderView* headerView =
140 self.appBar.headerViewController.headerView; 140 self.appBar.headerViewController.headerView;
141 headerView.maximumHeight = 141 headerView.maximumHeight =
142 MAX(kHeaderViewMinHeight, kHeaderViewHeightMultiplier * viewSize.height); 142 MAX(kHeaderViewMinHeight, kHeaderViewHeightMultiplier * viewSize.height);
143 } 143 }
144 144
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 [self.collectionViewModel itemTypeForIndexPath:indexPath]; 321 [self.collectionViewModel itemTypeForIndexPath:indexPath];
322 return (itemType == ItemTypeTitle); 322 return (itemType == ItemTypeTitle);
323 } 323 }
324 324
325 - (BOOL)collectionView:(nonnull UICollectionView*)collectionView 325 - (BOOL)collectionView:(nonnull UICollectionView*)collectionView
326 shouldHideItemBackgroundAtIndexPath:(nonnull NSIndexPath*)indexPath { 326 shouldHideItemBackgroundAtIndexPath:(nonnull NSIndexPath*)indexPath {
327 return YES; 327 return YES;
328 } 328 }
329 329
330 @end 330 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698