diff options
| author | justincohen <justincohen@chromium.org> | 2015-06-10 10:38:16 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-10 17:38:49 +0000 |
| commit | 5a862993ea3a0c7593ac58971015f8122bda7a56 (patch) | |
| tree | eb637250741ee5515e1ed3aeb6a0ead6494fb14a /ios/chrome/browser/infobars | |
| parent | 39825ed5795d26cc69167c1fe774f23117cc8f77 (diff) | |
| download | chromium_src-5a862993ea3a0c7593ac58971015f8122bda7a56.zip chromium_src-5a862993ea3a0c7593ac58971015f8122bda7a56.tar.gz chromium_src-5a862993ea3a0c7593ac58971015f8122bda7a56.tar.bz2 | |
Correct iOS build for latest Xcode beta.
- NSObject's NS_DESIGNATED_INITIALIZER -init method requires
an -init NS_UNAVAILABLE implementation.
- Correct nonnull API usage.
- Cast to NSInteger for comparisons with NSNotFound.
- Account for dylib -> tbd change in latest Xcode.
BUG=498581, 498825, 498841
Review URL: https://codereview.chromium.org/1171203004
Cr-Commit-Position: refs/heads/master@{#333756}
Diffstat (limited to 'ios/chrome/browser/infobars')
| -rw-r--r-- | ios/chrome/browser/infobars/infobar_controller.h | 3 | ||||
| -rw-r--r-- | ios/chrome/browser/infobars/infobar_controller.mm | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ios/chrome/browser/infobars/infobar_controller.h b/ios/chrome/browser/infobars/infobar_controller.h index d29299c..c77e229 100644 --- a/ios/chrome/browser/infobars/infobar_controller.h +++ b/ios/chrome/browser/infobars/infobar_controller.h @@ -18,11 +18,12 @@ class InfoBarDelegate; @interface InfoBarController : NSObject @property(nonatomic, readonly) InfoBarViewDelegate* delegate; - // Designated initializer. - (instancetype)initWithDelegate:(InfoBarViewDelegate*)delegate NS_DESIGNATED_INITIALIZER; +- (instancetype)init NS_UNAVAILABLE; + // Creates a view and lays out all the infobar elements in it. Will not add // it as a subview yet. This method must be overriden in subclasses. - (base::scoped_nsobject<UIView<InfoBarViewProtocol>>) diff --git a/ios/chrome/browser/infobars/infobar_controller.mm b/ios/chrome/browser/infobars/infobar_controller.mm index 594f0f3..c2c4875 100644 --- a/ios/chrome/browser/infobars/infobar_controller.mm +++ b/ios/chrome/browser/infobars/infobar_controller.mm @@ -25,6 +25,11 @@ return self; } +- (instancetype)init { + NOTREACHED(); + return nil; +} + - (void)dealloc { [_infoBarView removeFromSuperview]; [super dealloc]; |