InstantExtended: Nuke InstantOverlayController.

chrome/browser/ui/cocoa/browser_window_controller.mm

 // Copyright 2012 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 "chrome/browser/ui/cocoa/browser_window_controller.h"
 
 #include <cmath>
 #include <numeric>
 
 #include "base/command_line.h"
@@ skipping 1593 matching lines @@
   // Update the bookmark bar.
   // Must do it after devtools updates, otherwise bookmark bar might
   // call resizeView -> layoutSubviews and cause unnecessary relayout.
   // TODO(viettrungluu): perhaps update to not terminate running animations (if
   // applicable)?
   windowShim_->BookmarkBarStateChanged(
       BookmarkBar::DONT_ANIMATE_STATE_CHANGE);
 
   [infoBarContainerController_ changeWebContents:contents];
 
-  [overlayableContentsController_ onActivateTabWithContents:contents];
-
   [self updateAllowOverlappingViews:[self inPresentationMode]];
 }
 
 - (void)onTabChanged:(TabStripModelObserver::TabChangeType)change
         withContents:(WebContents*)contents {
   // Update titles if this is the currently selected tab and if it isn't just
   // the loading state which changed.
   if (change != TabStripModelObserver::LOADING_ONLY)
     windowShim_->UpdateTitleBar();
 
@@ skipping 318 matching lines @@
 
   // Adjust to account for height and possible bookmark bar. Compress by 1
   // to account for the separator.
   anchorRect.origin.y =
       NSMaxY(anchorRect) - [toolbarController_ desiredHeightForCompression:1];
 
   // Shift to window base coordinates.
   return [[toolbarView superview] convertRect:anchorRect toView:nil];
 }
 
-- (NSRect)instantFrame {
-  // The view's bounds are in its own coordinate system.  Convert that to the
-  // window base coordinate system, then translate it into the screen's
-  // coordinate system.
-  NSView* view = [overlayableContentsController_ view];
-  if (!view)
-    return NSZeroRect;
-
-  NSRect frame = [view convertRect:[view bounds] toView:nil];
-  NSPoint originInScreenCoords =
-      [[view window] convertBaseToScreen:frame.origin];
-  frame.origin = originInScreenCoords;
-
-  // Account for the bookmark bar height if it is currently in the detached
-  // state on the new tab page.
-  if ([bookmarkBarController_ isInState:BookmarkBar::DETACHED])
-    frame.size.height += NSHeight([[bookmarkBarController_ view] bounds]);
-
-  return frame;
-}
-
 - (void)sheetDidEnd:(NSWindow*)sheet
          returnCode:(NSInteger)code
             context:(void*)context {
   [sheet orderOut:self];
 }
 
 - (void)onFindBarVisibilityChanged {
   [self updateAllowOverlappingViews:[self inPresentationMode]];
 }
 
@@ skipping 273 matching lines @@
 
 - (BOOL)supportsBookmarkBar {
   return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
 }
 
 - (BOOL)isTabbedWindow {
   return browser_->is_type_tabbed();
 }
 
 @end  // @implementation BrowserWindowController(WindowType)