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

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

Issue 2430463003: Removed use of IsRunningOnIOS8OrLater from ui_util and uikit_ui_util (Closed)
Patch Set: Created 4 years, 2 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 | « no previous file | ios/chrome/browser/ui/uikit_ui_util.mm » ('j') | ios/chrome/browser/ui/uikit_ui_util.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/browser/ui/ui_util.mm
diff --git a/ios/chrome/browser/ui/ui_util.mm b/ios/chrome/browser/ui/ui_util.mm
index 17831534307eae08d589b22c0fc36d992ada6b91..3de73ed857cdf34cf24e91b57b1f6c8f65417e1e 100644
--- a/ios/chrome/browser/ui/ui_util.mm
+++ b/ios/chrome/browser/ui/ui_util.mm
@@ -6,7 +6,6 @@
#import <UIKit/UIKit.h>
-#include "base/ios/ios_util.h"
#include "base/logging.h"
#import "ios/chrome/browser/ui/uikit_ui_util.h"
#include "ui/gfx/ios/uikit_util.h"
@@ -43,20 +42,12 @@ bool IsLandscape() {
CGFloat CurrentScreenHeight() {
CGSize screenSize = [UIScreen mainScreen].bounds.size;
justincohen 2016/10/18 10:59:20 return [UIScreen mainScreen].bounds.size.height ?
pkl (ping after 24h if needed) 2016/10/19 18:47:32 Done.
- if (base::ios::IsRunningOnIOS8OrLater()) {
- return screenSize.height;
- } else {
- return IsPortrait() ? screenSize.height : screenSize.width;
- }
+ return screenSize.height;
}
CGFloat CurrentScreenWidth() {
CGSize screenSize = [UIScreen mainScreen].bounds.size;
justincohen 2016/10/18 10:59:20 return [UIScreen mainScreen].bounds.size.width ?
pkl (ping after 24h if needed) 2016/10/19 18:47:32 Done.
- if (base::ios::IsRunningOnIOS8OrLater()) {
- return screenSize.width;
- } else {
- return IsPortrait() ? screenSize.width : screenSize.height;
- }
+ return screenSize.width;
}
CGFloat StatusBarHeight() {
« no previous file with comments | « no previous file | ios/chrome/browser/ui/uikit_ui_util.mm » ('j') | ios/chrome/browser/ui/uikit_ui_util.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698