[ios] Remove some keyWindow uses (ios 12 deprecation, mw)

Removed orientation [uikit_]ui_util fncts that relied on
[[UIApplication] sharedApp].keyWindow.

Change-Id: I2936c5c1afd2c682fa967db896ba3b5161144be1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2424085
Commit-Queue: David Jean <djean@chromium.org>
Reviewed-by: Mark Cogan <marq@chromium.org>
Reviewed-by: Gauthier Ambard <gambard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#809763}

ios/chrome/browser/ntp_snippets/ios_chrome_content_suggestions_service_factory_util.cc

@@ -44,7 +44,6 @@
 #include "ios/chrome/browser/json_parser/in_process_json_parser.h"
 #include "ios/chrome/browser/pref_names.h"
 #include "ios/chrome/browser/signin/identity_manager_factory.h"
-#include "ios/chrome/browser/ui/util/ui_util.h"
 #include "ios/chrome/common/channel_info.h"
 #include "ios/web/public/browser_state.h"
 #include "net/url_request/url_request_context_getter.h"

ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_discover_header_item.mm

@@ -134,7 +134,7 @@ const CGFloat kFeedCardIPhoneWidth = 375;
     // TODO(b/167703449): Once the card width and padding is exposed we should
     // stop hardcoding this for some iPhones (the ones with a portrait width of
     // kFeedCardIPhoneWidth) and use those values instead.
-    BOOL shouldFixWidth = IsPortrait()
+    BOOL shouldFixWidth = IsPortrait(self.window)
                               ? (CurrentScreenWidth() == kFeedCardIPhoneWidth)
                               : (CurrentScreenHeight() == kFeedCardIPhoneWidth);
     if (shouldFixWidth) {

ios/chrome/browser/ui/sad_tab/sad_tab_view.mm

@@ -448,7 +448,7 @@ NSString* const kMessageTextViewBulletRTLFormat = @"\u202E%@\u202C";
 - (void)layoutActionButton {
   CGRect containerBounds = self.containerBounds;
   BOOL isIPadIdiom = IsIPadIdiom();
-  BOOL isPortrait = IsPortrait();
+  BOOL isPortrait = IsPortrait(self.window);
   BOOL shouldAddActionButtonToContainer = isIPadIdiom || !isPortrait;
   LayoutRect actionButtonLayout = LayoutRectZero;
   actionButtonLayout.size =
@@ -491,7 +491,7 @@ NSString* const kMessageTextViewBulletRTLFormat = @"\u202E%@\u202C";
     // Center the containerView on iPads.
     containerOriginY =
         (CGRectGetHeight(self.bounds) - containerSize.height) / 2.0f;
-  } else if (IsPortrait()) {
+  } else if (IsPortrait(self.window)) {
     // Align containerView to a quarter of the view height on portrait iPhones.
     containerOriginY =
         (CGRectGetHeight(self.bounds) - containerSize.height) / 4.0f;

ios/chrome/browser/ui/safe_mode/safe_mode_view_controller.mm

@@ -149,7 +149,7 @@ const NSTimeInterval kUploadTotalTime = 5;
   // bounds will still be landscape at this point. Swap the height and width
   // here so that the dimensions will be correct once the app rotates to
   // portrait.
-  if (IsLandscape()) {
+  if (IsLandscape(self.view.window)) {
     mainBounds.size = CGSizeMake(mainBounds.size.height, mainBounds.size.width);
   }
   UIScrollView* scrollView = [[UIScrollView alloc] initWithFrame:mainBounds];

ios/chrome/browser/ui/util/ui_util.h

@@ -20,13 +20,6 @@ enum InterfaceIdiom { IPHONE_IDIOM, IPAD_IDIOM, INTERFACE_IDIOM_COUNT };
 // Array of widths for device idioms in portrait orientation.
 extern const CGFloat kPortraitWidth[INTERFACE_IDIOM_COUNT];
 
-// Returns true if the device is in portrait orientation or if interface
-// orientation is unknown.
-bool IsPortrait();
-
-// Returns true if the device is in landscape orientation.
-bool IsLandscape();
-
 // Returns the height of the screen in the current orientation.
 CGFloat CurrentScreenHeight();
 

ios/chrome/browser/ui/util/ui_util.mm

@@ -29,16 +29,6 @@ const CGFloat kPortraitWidth[INTERFACE_IDIOM_COUNT] = {
     768   // IPAD_IDIOM
 };
 
-bool IsPortrait() {
-  UIInterfaceOrientation orient = GetInterfaceOrientation();
-  return UIInterfaceOrientationIsPortrait(orient) ||
-         orient == UIInterfaceOrientationUnknown;
-}
-
-bool IsLandscape() {
-  return UIInterfaceOrientationIsLandscape(GetInterfaceOrientation());
-}
-
 CGFloat CurrentScreenHeight() {
   return [UIScreen mainScreen].bounds.size.height;
 }

ios/chrome/browser/ui/util/uikit_ui_util.h

@@ -179,8 +179,8 @@ UIView* GetFirstResponderSubview(UIView* view);
 // Returns a cropped image using |cropRect| on |image|.
 UIImage* CropImage(UIImage* image, const CGRect& cropRect);
 
-// Returns the interface orientation of the app.
-UIInterfaceOrientation GetInterfaceOrientation();
+// Returns the interface orientation of the given window in the app.
+UIInterfaceOrientation GetInterfaceOrientation(UIWindow* window);
 
 // Returns the height of the keyboard in the current orientation.
 CGFloat CurrentKeyboardHeight(NSValue* keyboardFrameValue);
@@ -199,6 +199,13 @@ UIColor* InterpolateFromColorToColor(UIColor* firstColor,
                                      UIColor* secondColor,
                                      CGFloat fraction);
 
+// Returns true if the window is in portrait orientation or if orientation is
+// unknown.
+bool IsPortrait(UIWindow* window);
+
+// Returns true if the window is in landscape orientation.
+bool IsLandscape(UIWindow* window);
+
 // Whether the |environment| has a compact horizontal size class.
 bool IsCompactWidth(id<UITraitEnvironment> environment);
 

ios/chrome/browser/ui/util/uikit_ui_util.mm

@@ -513,8 +513,12 @@ UIImage* CropImage(UIImage* image, const CGRect& cropRect) {
   return result;
 }
 
-UIInterfaceOrientation GetInterfaceOrientation() {
+UIInterfaceOrientation GetInterfaceOrientation(UIWindow* window) {
+#if !defined(__IPHONE_13_0) || __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_13_0
   return [[UIApplication sharedApplication] statusBarOrientation];
+#else
+  return window.windowScene.interfaceOrientation;
+#endif
 }
 
 CGFloat CurrentKeyboardHeight(NSValue* keyboardFrameValue) {
@@ -571,6 +575,16 @@ UIColor* InterpolateFromColorToColor(UIColor* firstColor,
                          alpha:Lerp(a1, a2, fraction)];
 }
 
+bool IsPortrait(UIWindow* window) {
+  UIInterfaceOrientation orient = GetInterfaceOrientation(window);
+  return UIInterfaceOrientationIsPortrait(orient) ||
+         orient == UIInterfaceOrientationUnknown;
+}
+
+bool IsLandscape(UIWindow* window) {
+  return UIInterfaceOrientationIsLandscape(GetInterfaceOrientation(window));
+}
+
 bool IsCompactWidth(id<UITraitEnvironment> environment) {
   return IsCompactWidth(environment.traitCollection);
 }