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

Unified Diff: ios/chrome/browser/ui/uikit_ui_util.mm

Issue 1329713002: Add convenience methods for checking horizontal size class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Synced Created 5 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ios/chrome/browser/ui/uikit_ui_util.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/browser/ui/uikit_ui_util.mm
diff --git a/ios/chrome/browser/ui/uikit_ui_util.mm b/ios/chrome/browser/ui/uikit_ui_util.mm
index 6f0ac49dac794b4a47e4a36c43629eda3306ec93..f5b315c898617af9d368cf58e42cda11083b4328 100644
--- a/ios/chrome/browser/ui/uikit_ui_util.mm
+++ b/ios/chrome/browser/ui/uikit_ui_util.mm
@@ -517,10 +517,9 @@ void AddSameCenterYConstraint(UIView* parentView,
constant:0]];
}
-bool IsCompact() {
+bool IsCompact(id<UITraitEnvironment> environment) {
if (base::ios::IsRunningOnIOS8OrLater()) {
- UIWindow* keyWindow = [UIApplication sharedApplication].keyWindow;
- return [keyWindow.traitCollection horizontalSizeClass] ==
+ return environment.traitCollection.horizontalSizeClass ==
UIUserInterfaceSizeClassCompact;
} else {
// Prior to iOS 8, iPad is always regular, iPhone is always compact.
@@ -528,6 +527,15 @@ bool IsCompact() {
}
}
+bool IsCompact() {
+ UIWindow* keyWindow = [UIApplication sharedApplication].keyWindow;
+ return IsCompact(keyWindow);
+}
+
+bool IsCompactTablet(id<UITraitEnvironment> environment) {
+ return IsIPadIdiom() && IsCompact(environment);
+}
+
bool IsCompactTablet() {
return IsIPadIdiom() && IsCompact();
}
« no previous file with comments | « ios/chrome/browser/ui/uikit_ui_util.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698