Commit 6c18c060 authored by Gauthier Ambard's avatar Gauthier Ambard Committed by Commit Bot

[iOS] Remove launch mask when the BVC is contained

The launch mask was used to prevent the user from seeing the TabGrid when
a tab should have been presented as it is not possible to directly show
the BVC when it is presented.
Having it contained allow to remove this workaround.

Bug: 1038034
Change-Id: I2cc74afe5d00406d1be4de20ed7e96f50cd839a2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2061759
Commit-Queue: Gauthier Ambard <gambard@chromium.org>
Reviewed-by: default avatarMark Cogan <marq@chromium.org>
Cr-Commit-Position: refs/heads/master@{#742141}
parent 5b996fea
......@@ -205,16 +205,19 @@
regularWebStateList;
baseViewController.remoteTabsViewController.presentationDelegate = self;
// Insert the launch screen view in front of this view to hide it until after
// launch. This should happen before |baseViewController| is made the window's
// root view controller.
NSBundle* mainBundle = base::mac::FrameworkBundle();
NSArray* topObjects =
[mainBundle loadNibNamed:@"LaunchScreen" owner:self options:nil];
UIViewController* launchScreenController =
base::mac::ObjCCastStrict<UIViewController>([topObjects lastObject]);
self.launchMaskView = launchScreenController.view;
[baseViewController.view addSubview:self.launchMaskView];
if (!base::FeatureList::IsEnabled(kContainedBVC)) {
// Insert the launch screen view in front of this view to hide it until
// after launch. This should happen before |baseViewController| is made the
// window's root view controller.
NSBundle* mainBundle = base::mac::FrameworkBundle();
NSArray* topObjects = [mainBundle loadNibNamed:@"LaunchScreen"
owner:self
options:nil];
UIViewController* launchScreenController =
base::mac::ObjCCastStrict<UIViewController>([topObjects lastObject]);
self.launchMaskView = launchScreenController.view;
[baseViewController.view addSubview:self.launchMaskView];
}
// TODO(crbug.com/850387) : Currently, consumer calls from the mediator
// prematurely loads the view in |RecentTabsTableViewController|. Fix this so
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment