Index: ios/clean/chrome/browser/ui/tab_strip/tab_strip_container_view_controller.mm |
diff --git a/ios/clean/chrome/browser/ui/tab_strip/tab_strip_container_view_controller.mm b/ios/clean/chrome/browser/ui/tab_strip/tab_strip_container_view_controller.mm |
index 0fcdfe743d3923792fcf0e9c34656ea640328993..5a8c92fde6961b0f61b9238fe0365a569da657b8 100644 |
--- a/ios/clean/chrome/browser/ui/tab_strip/tab_strip_container_view_controller.mm |
+++ b/ios/clean/chrome/browser/ui/tab_strip/tab_strip_container_view_controller.mm |
@@ -36,8 +36,9 @@ CGFloat kStripHeight = 200.0; |
@property(nonatomic, strong) NSLayoutConstraint* stripHeightConstraint; |
-// Contained view controller utility methods. |
-- (void)removeChildViewController:(UIViewController*)viewController; |
+// Contained view controller utility methods. This method cannot be named |
+//-removeChildViewController:, as that is a private superclass method. |
+- (void)detachChildViewController:(UIViewController*)viewController; |
// Called after a new content view controller is set, but before |
// |-didMoveToParentViewController:| is called on that view controller. |
@@ -76,7 +77,7 @@ CGFloat kStripHeight = 200.0; |
[NSLayoutConstraint |
deactivateConstraints:self.contentConstraintsWithoutStrip]; |
[NSLayoutConstraint deactivateConstraints:self.contentConstraintsWithStrip]; |
- [self removeChildViewController:self.contentViewController]; |
+ [self detachChildViewController:self.contentViewController]; |
// Add the new content view controller. |
[self addChildViewController:contentViewController]; |
@@ -95,7 +96,7 @@ CGFloat kStripHeight = 200.0; |
// Remove the current strip view controller, if any. |
[NSLayoutConstraint deactivateConstraints:self.stripConstraints]; |
[NSLayoutConstraint deactivateConstraints:self.contentConstraintsWithStrip]; |
- [self removeChildViewController:self.tabStripViewController]; |
+ [self detachChildViewController:self.tabStripViewController]; |
// Add the new strip view controller. |
[self addChildViewController:tabStripViewController]; |
@@ -212,7 +213,7 @@ CGFloat kStripHeight = 200.0; |
#pragma mark - Private methods |
-- (void)removeChildViewController:(UIViewController*)viewController { |
+- (void)detachChildViewController:(UIViewController*)viewController { |
if (viewController.parentViewController != self) |
return; |
[viewController willMoveToParentViewController:nil]; |