| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/UIView+SizeClassSupport.h" | 5 #import "ios/chrome/browser/ui/UIView+SizeClassSupport.h" |
| 6 | 6 |
| 7 #import "base/logging.h" | 7 #import "base/logging.h" |
| 8 #import "base/ios/ios_util.h" | 8 #import "base/ios/ios_util.h" |
| 9 #import "ios/chrome/browser/ui/ui_util.h" | 9 #import "ios/chrome/browser/ui/ui_util.h" |
| 10 | 10 |
| 11 #if !defined(__has_feature) || !__has_feature(objc_arc) | |
| 12 #error "This file requires ARC support." | |
| 13 #endif | |
| 14 | |
| 15 namespace { | 11 namespace { |
| 16 | 12 |
| 17 // Returns the SizeClassIdiom corresponding with |size_class|. | 13 // Returns the SizeClassIdiom corresponding with |size_class|. |
| 18 SizeClassIdiom GetSizeClassIdiom(UIUserInterfaceSizeClass size_class) { | 14 SizeClassIdiom GetSizeClassIdiom(UIUserInterfaceSizeClass size_class) { |
| 19 switch (size_class) { | 15 switch (size_class) { |
| 20 case UIUserInterfaceSizeClassCompact: | 16 case UIUserInterfaceSizeClassCompact: |
| 21 return COMPACT; | 17 return COMPACT; |
| 22 case UIUserInterfaceSizeClassRegular: | 18 case UIUserInterfaceSizeClassRegular: |
| 23 return REGULAR; | 19 return REGULAR; |
| 24 case UIUserInterfaceSizeClassUnspecified: | 20 case UIUserInterfaceSizeClassUnspecified: |
| (...skipping 20 matching lines...) Expand all Loading... |
| 45 | 41 |
| 46 - (SizeClassIdiom)cr_heightSizeClass { | 42 - (SizeClassIdiom)cr_heightSizeClass { |
| 47 UIWindow* keyWindow = [UIApplication sharedApplication].keyWindow; | 43 UIWindow* keyWindow = [UIApplication sharedApplication].keyWindow; |
| 48 UIUserInterfaceSizeClass sizeClass = self.traitCollection.verticalSizeClass; | 44 UIUserInterfaceSizeClass sizeClass = self.traitCollection.verticalSizeClass; |
| 49 if (!IsSizeClassSpecified(sizeClass)) | 45 if (!IsSizeClassSpecified(sizeClass)) |
| 50 sizeClass = keyWindow.traitCollection.verticalSizeClass; | 46 sizeClass = keyWindow.traitCollection.verticalSizeClass; |
| 51 return GetSizeClassIdiom(sizeClass); | 47 return GetSizeClassIdiom(sizeClass); |
| 52 } | 48 } |
| 53 | 49 |
| 54 @end | 50 @end |
| OLD | NEW |