[ios clean] Dismisses ToolsMenu on Layout changes.

ios/clean/chrome/browser/ui/tab_grid/tab_grid_view_controller.mm

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "ios/clean/chrome/browser/ui/tab_grid/tab_grid_view_controller.h"
 
 #include "base/mac/foundation_util.h"
 #import "ios/chrome/browser/ui/tab_switcher/tab_switcher_panel_overlay_view.h"
 #import "ios/clean/chrome/browser/ui/actions/settings_actions.h"
 #import "ios/clean/chrome/browser/ui/actions/tab_grid_actions.h"
 #import "ios/clean/chrome/browser/ui/commands/settings_commands.h"
 #import "ios/clean/chrome/browser/ui/commands/tab_grid_commands.h"
 #import "ios/clean/chrome/browser/ui/commands/tools_menu_commands.h"
 #import "ios/clean/chrome/browser/ui/tab_collection/tab_collection_data_source.h"
 #import "ios/clean/chrome/browser/ui/tab_collection/tab_collection_tab_cell.h"
 #import "ios/clean/chrome/browser/ui/tab_grid/mdc_floating_button+cr_tab_grid.h"
 #import "ios/clean/chrome/browser/ui/tab_grid/tab_grid_collection_view_layout.h"
 #import "ios/clean/chrome/browser/ui/tab_grid/tab_grid_toolbar.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
 @interface TabGridViewController ()<SettingsActions, TabGridActions>
 @property(nonatomic, weak) UIView* noTabsOverlay;
 @property(nonatomic, weak) TabGridToolbar* toolbar;
 @property(nonatomic, weak) MDCFloatingButton* floatingNewTabButton;
+@property(nonatomic, assign) CGRect currentFrame;
 @end
 
 @implementation TabGridViewController
 @synthesize dispatcher = _dispatcher;
 @synthesize noTabsOverlay = _noTabsOverlay;
 @synthesize toolbar = _toolbar;
 @synthesize floatingNewTabButton = _floatingNewTabButton;
+@synthesize currentFrame = _currentFrame;
 
 #pragma mark - Required subclass override
 
 - (UICollectionViewLayout*)collectionViewLayout {
   return [[TabGridCollectionViewLayout alloc] init];
 }
 
 - (void)showTabAtIndex:(int)index {
   [self.dispatcher showTabGridTabAtIndex:index];
 }
@@ skipping 14 matching lines @@
   [NSLayoutConstraint activateConstraints:@[
     [self.toolbar.topAnchor constraintEqualToAnchor:self.view.topAnchor],
     [self.toolbar.heightAnchor
         constraintEqualToAnchor:self.topLayoutGuide.heightAnchor
                        constant:self.toolbar.intrinsicContentSize.height],
     [self.toolbar.leadingAnchor
         constraintEqualToAnchor:self.view.leadingAnchor],
     [self.toolbar.trailingAnchor
         constraintEqualToAnchor:self.view.trailingAnchor]
   ]];
+
+  self.currentFrame = self.view.frame;
 }
 
 - (void)viewWillAppear:(BOOL)animated {
   [super viewWillAppear:animated];
   MDCFloatingButton* floatingNewTabButton =
       [MDCFloatingButton cr_tabGridNewTabButton];
   self.floatingNewTabButton = floatingNewTabButton;
   [self.floatingNewTabButton
       setFrame:[MDCFloatingButton
                    cr_frameForTabGridNewTabButtonInRect:self.view.bounds]];
   [self.view addSubview:self.floatingNewTabButton];
 }
 
 - (void)viewDidLayoutSubviews {
   [super viewDidLayoutSubviews];
   self.tabs.contentInset =
       UIEdgeInsetsMake(CGRectGetMaxY(self.toolbar.frame), 0, 0, 0);
 }
 
+- (void)viewWillLayoutSubviews {
+  // We need to dismiss the ToolsMenu everytime the Toolbar frame changes
+  // (e.g. Size changes, rotation changes, etc.)
+  if (!CGRectEqualToRect(self.currentFrame, self.view.frame)) {
+    [self.dispatcher closeToolsMenu];
+  }
+  self.currentFrame = self.view.frame;
+}
+
 #pragma mark - SettingsActions
 
 - (void)showSettings:(id)sender {
   [self.dispatcher showSettings];
 }
 
 #pragma mark - ToolsMenuActions
 
 - (void)showToolsMenu:(id)sender {
   [self.dispatcher showToolsMenu];
@@ skipping 39 matching lines @@
       UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
   [self.tabs addSubview:overlayView];
   self.noTabsOverlay = overlayView;
 }
 
 - (void)removeNoTabsOverlay {
   [self.noTabsOverlay removeFromSuperview];
 }
 
 @end