[multiball] Don't expose BrowserInterfaceProvider in SceneControllerGuts

Removes the BVWrangler from the temporary interface, and instead sets
up a more permanent scheme:
1. SceneState exposes an interface provider
2. AppState allows access to SceneStates
3. MainController uses AppState's scenes to find an interface provider.

Note that a lot of code in MainController still assumes a single window
and this is not fixed in this CL.

Also breaks down application_delegate_internal target by splitting
out tab_opening. This allows to avoid a deps cycle.

Bug: 1045660
Change-Id: Iabd71bc18c901d6990dfdec77190605c4f51cb0a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2120404Reviewed-by: Mark Cogan <marq@chromium.org>
Commit-Queue: Stepan Khapugin <stkhapugin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#753966}

ios/chrome/app/BUILD.gn

@@ -48,6 +48,7 @@ source_set("unit_tests") {
     "//components/metrics",
     "//components/prefs",
     "//ios/chrome/app/application_delegate:application_delegate_internal",
+    "//ios/chrome/app/application_delegate:tab_opening",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/tabs",
@@ -158,6 +159,7 @@ source_set("app_internal") {
     "//components/web_resource",
     "//ios/chrome/app/application_delegate",
     "//ios/chrome/app/application_delegate:application_delegate_internal",
+    "//ios/chrome/app/application_delegate:tab_opening",
     "//ios/chrome/app/intents",
     "//ios/chrome/app/spotlight",
     "//ios/chrome/app/startup",

ios/chrome/app/application_delegate/BUILD.gn

@@ -30,6 +30,7 @@ source_set("unit_tests") {
   deps = [
     ":application_delegate",
     ":application_delegate_internal",
+    ":tab_opening",
     ":test_support",
     "//base",
     "//base/test:test_support",
@@ -83,6 +84,24 @@ source_set("unit_tests") {
   libs = [ "CoreSpotlight.framework" ]
 }
 
+source_set("tab_opening") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "tab_opening.h",
+    "tab_switching.h",
+  ]
+  deps = [
+    "//base",
+    "//ios/chrome/app",
+    "//ios/chrome/app:mode",
+    "//ui/base",
+  ]
+  libs = [
+    "CoreSpotlight.framework",
+    "UIKit.framework",
+  ]
+}
+
 source_set("application_delegate_internal") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
@@ -92,7 +111,6 @@ source_set("application_delegate_internal") {
     "metrics_mediator.h",
     "metrics_mediator.mm",
     "startup_information.h",
-    "tab_opening.h",
     "tab_switching.h",
     "url_opener.h",
     "url_opener.mm",
@@ -101,6 +119,7 @@ source_set("application_delegate_internal") {
   ]
   deps = [
     ":application_delegate",
+    ":tab_opening",
     "//base",
     "//build:branding_buildflags",
     "//components/crash/core/common",
@@ -132,8 +151,10 @@ source_set("application_delegate_internal") {
     "//ios/chrome/browser/ui/browser_view",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/main",
+    "//ios/chrome/browser/ui/main:scene",
     "//ios/chrome/browser/ui/safe_mode",
     "//ios/chrome/browser/ui/util",
+    "//ios/chrome/browser/ui/util:multiwindow_util",
     "//ios/chrome/browser/url_loading",
     "//ios/chrome/browser/web:tab_id_tab_helper",
     "//ios/chrome/browser/web_state_list",
@@ -151,7 +172,10 @@ source_set("application_delegate_internal") {
     "CoreSpotlight.framework",
     "UIKit.framework",
   ]
-  allow_circular_includes_from = [ "//ios/chrome/browser/url_loading" ]
+  allow_circular_includes_from = [
+    "//ios/chrome/browser/url_loading",
+    "//ios/chrome/browser/ui/main:scene",
+  ]
 }
 
 source_set("test_support") {
@@ -167,6 +191,7 @@ source_set("test_support") {
   ]
   deps = [
     ":application_delegate_internal",
+    ":tab_opening",
     "//base",
     "//base/test:test_support",
     "//ios/chrome/app",

ios/chrome/app/application_delegate/app_state.h

@@ -8,6 +8,7 @@
 #import <UIKit/UIKit.h>
 
 @protocol BrowserLauncher;
+@class SceneState;
 @class MainApplicationDelegate;
 @class MemoryWarningHelper;
 @class MetricsMediator;
@@ -35,6 +36,10 @@ initWithBrowserLauncher:(id<BrowserLauncher>)browserLauncher
 // Set the property before calling methods related to it.
 @property(nonatomic, weak) UIWindow* window;
 
+// When multiwindow is unavailable, this is the only scene state. It is created
+// by the app delegate.
+@property(nonatomic, strong) SceneState* mainSceneState;
+
 // Saves the launchOptions to be used from -newTabFromLaunchOptions. If the
 // application is in background, initialize the browser to basic. If not, launch
 // the browser.
@@ -80,6 +85,9 @@ initWithBrowserLauncher:(id<BrowserLauncher>)browserLauncher
 // -performActionForShortcutItem or -openURL.
 - (void)launchFromURLHandled:(BOOL)URLHandled;
 
+// Returns a list of all connected scenes.
+- (NSArray<SceneState*>*)connectedScenes;
+
 @end
 
 #endif  // IOS_CHROME_APP_APPLICATION_DELEGATE_APP_STATE_H_

ios/chrome/app/application_delegate/app_state.mm

@@ -46,7 +46,10 @@
 #import "ios/chrome/browser/ui/commands/browser_commands.h"
 #import "ios/chrome/browser/ui/commands/open_new_tab_command.h"
 #import "ios/chrome/browser/ui/main/browser_interface_provider.h"
+#import "ios/chrome/browser/ui/main/scene_delegate.h"
+#import "ios/chrome/browser/ui/main/scene_state.h"
 #import "ios/chrome/browser/ui/safe_mode/safe_mode_coordinator.h"
+#import "ios/chrome/browser/ui/util/multi_window_support.h"
 #include "ios/chrome/browser/ui/util/ui_util.h"
 #include "ios/net/cookies/cookie_store_ios.h"
 #include "ios/net/cookies/system_cookie_util.h"
@@ -458,6 +461,26 @@ initWithBrowserLauncher:(id<BrowserLauncher>)browserLauncher
   self.shouldPerformAdditionalDelegateHandling = !URLHandled;
 }
 
+#pragma mark - Multiwindow-related
+
+- (NSArray<SceneState*>*)connectedScenes {
+  if (IsMultiwindowSupported()) {
+    NSMutableArray* sceneStates = [[NSMutableArray alloc] init];
+    if (@available(iOS 13, *)) {
+      NSSet* connectedScenes =
+          [UIApplication sharedApplication].connectedScenes;
+      for (UIWindowScene* scene in connectedScenes) {
+        SceneDelegate* sceneDelegate =
+            base::mac::ObjCCastStrict<SceneDelegate>(scene.delegate);
+        [sceneStates addObject:sceneDelegate.sceneState];
+      }
+    }
+    return sceneStates;
+  } else {
+    return @[ self.mainSceneState ];
+  }
+}
+
 #pragma mark - SafeModeCoordinatorDelegate Implementation
 
 - (void)coordinatorDidExitSafeMode:(nonnull SafeModeCoordinator*)coordinator {

ios/chrome/app/main_application_delegate.mm

@@ -79,8 +79,10 @@
       // and a "scene" controller. This allows the rest of the app to be mostly
       // multiwindow-agnostic.
       _sceneState = [[SceneState alloc] init];
+      _appState.mainSceneState = _sceneState;
       _sceneController =
           [[SceneController alloc] initWithSceneState:_sceneState];
+      _sceneState.controller = _sceneController;
 
       // TODO(crbug.com/1040501): remove this.
       // This is temporary plumbing that's not supposed to be here.

ios/chrome/app/main_controller.mm

@@ -645,7 +645,7 @@ void MainControllerAuthenticationServiceDelegate::ClearBrowsingData(
 #pragma mark - Property implementation.
 
 - (id<BrowserInterfaceProvider>)interfaceProvider {
-  return self.sceneController.browserViewWrangler;
+  return self.appState.connectedScenes[0].interfaceProvider;
 }
 
 - (BOOL)isFirstLaunchAfterUpgrade {

ios/chrome/app/tab_opener_unittest.mm

@@ -6,6 +6,7 @@
 
 #include "base/threading/thread.h"
 #import "ios/chrome/app/application_delegate/app_state.h"
+#include "ios/chrome/app/application_delegate/startup_information.h"
 #import "ios/chrome/app/application_delegate/tab_opening.h"
 #import "ios/chrome/app/application_delegate/url_opener.h"
 #import "ios/chrome/browser/tabs/tab_model.h"

ios/chrome/browser/ui/main/BUILD.gn

@@ -7,7 +7,7 @@ import("//ios/build/chrome_build.gni")
 source_set("scene_guts") {
   sources = [ "scene_controller_guts.h" ]
   deps = [
-    "//ios/chrome/app/application_delegate:application_delegate_internal",
+    "//ios/chrome/app/application_delegate:tab_opening",
     "//ios/chrome/browser:utils",
     "//ios/chrome/browser/ui/tab_grid",
     "//ios/chrome/browser/url_loading",
@@ -37,7 +37,7 @@ source_set("scene") {
     "//ios/chrome/app:app",
     "//ios/chrome/app:mode",
     "//ios/chrome/app:tests_hook",
-    "//ios/chrome/app/application_delegate:application_delegate_internal",
+    "//ios/chrome/app/application_delegate:tab_opening",
     "//ios/chrome/browser",
     "//ios/chrome/browser:chrome_url_constants",
     "//ios/chrome/browser/browser_state",

ios/chrome/browser/ui/main/scene_controller.h

@@ -40,6 +40,10 @@
 // A temporary pointer to MainController.
 @property(nonatomic, weak) id<MainControllerGuts> mainController;
 
+// The interface provider for this scene.
+@property(nonatomic, strong, readonly) id<BrowserInterfaceProvider>
+    interfaceProvider;
+
 @end
 
 #endif  // IOS_CHROME_BROWSER_UI_MAIN_SCENE_CONTROLLER_H_

ios/chrome/browser/ui/main/scene_controller.mm

@@ -12,7 +12,6 @@
 #include "base/task/post_task.h"
 #include "components/signin/public/identity_manager/identity_manager.h"
 #include "components/url_formatter/url_formatter.h"
-#import "ios/chrome/app/application_delegate/app_state.h"
 #include "ios/chrome/app/application_delegate/tab_opening.h"
 #import "ios/chrome/app/application_delegate/url_opener.h"
 #include "ios/chrome/app/application_mode.h"
@@ -184,6 +183,10 @@ const NSTimeInterval kDisplayPromoDelay = 0.1;
 // YES while animating the dismissal of tab switcher.
 @property(nonatomic, assign) BOOL dismissingTabSwitcher;
 
+// Wrangler to handle BVC and tab model creation, access, and related logic.
+// Implements faetures exposed from this object through the
+// BrowserViewInformation protocol.
+@property(nonatomic, strong) BrowserViewWrangler* browserViewWrangler;
 // The coordinator used to control sign-in UI flows. Lazily created the first
 // time it is accessed.
 @property(nonatomic, strong) SigninCoordinator* signinCoordinator;
@@ -193,8 +196,6 @@ const NSTimeInterval kDisplayPromoDelay = 0.1;
 @implementation SceneController
 @synthesize appURLLoadingService =
     _appURLLoadingService;  //< From SceneControllerGuts
-@synthesize browserViewWrangler =
-    _browserViewWrangler;  //< From SceneControllerGuts
 
 - (instancetype)initWithSceneState:(SceneState*)sceneState {
   self = [super init];

ios/chrome/browser/ui/main/scene_controller_guts.h

@@ -7,7 +7,6 @@
 
 #import <UIKit/UIKit.h>
 
-#include "ios/chrome/app/application_delegate/startup_information.h"
 #import "ios/chrome/app/application_delegate/tab_opening.h"
 #import "ios/chrome/browser/procedural_block_types.h"
 #import "ios/chrome/browser/ui/tab_grid/tab_switcher.h"
@@ -19,11 +18,6 @@
 
 @protocol SceneControllerGuts <WebStateListObserving>
 
-// Wrangler to handle BVC and tab model creation, access, and related logic.
-// Implements faetures exposed from this object through the
-// BrowserViewInformation protocol.
-@property(nonatomic, strong) BrowserViewWrangler* browserViewWrangler;
-
 - (void)startUpChromeUIPostCrash:(BOOL)isPostCrashLaunch
                  needRestoration:(BOOL)needsRestoration;
 

ios/chrome/browser/ui/main/scene_delegate.mm

@@ -17,6 +17,7 @@
   if (!_sceneState) {
     _sceneState = [[SceneState alloc] init];
     _sceneController = [[SceneController alloc] initWithSceneState:_sceneState];
+    _sceneState.controller = _sceneController;
   }
   return _sceneState;
 }

ios/chrome/browser/ui/main/scene_state.h

@@ -7,7 +7,9 @@
 
 #import <UIKit/UIKit.h>
 
+@class SceneController;
 @class SceneState;
+@protocol BrowserInterfaceProvider;
 
 // Describes the possible scene states.
 // This is an iOS 12 compatible version of UISceneActivationState enum.
@@ -48,6 +50,13 @@ typedef NS_ENUM(NSUInteger, SceneActivationLevel) {
 
 @property(nonatomic, strong) UIWindowScene* scene API_AVAILABLE(ios(13));
 
+// The interface provider associated with this scene.
+@property(nonatomic, strong, readonly) id<BrowserInterfaceProvider>
+    interfaceProvider;
+
+// The controller for this scene.
+@property(nonatomic, weak) SceneController* controller;
+
 // Adds an observer to this scene state. The observers will be notified about
 // scene state changes per SceneStateObserver protocol.
 - (void)addObserver:(id<SceneStateObserver>)observer;

ios/chrome/browser/ui/main/scene_state.mm

@@ -6,6 +6,7 @@
 
 #import "base/ios/crb_protocol_observers.h"
 #import "ios/chrome/app/chrome_overlay_window.h"
+#import "ios/chrome/browser/ui/main/scene_controller.h"
 #import "ios/chrome/browser/ui/util/multi_window_support.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
@@ -84,6 +85,10 @@
   [self.observers sceneState:self transitionedToActivationLevel:newLevel];
 }
 
+- (id<BrowserInterfaceProvider>)interfaceProvider {
+  return self.controller.interfaceProvider;
+}
+
 #pragma mark - debug
 
 - (NSString*)description {

ios/chrome/browser/url_loading/BUILD.gn

@@ -28,6 +28,7 @@ source_set("url_loading") {
     "//components/search_engines",
     "//components/sessions",
     "//ios/chrome/app:mode",
+    "//ios/chrome/app/application_delegate:tab_opening",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/feature_engagement",