Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2878)

Unified Diff: chrome/browser/ui/cocoa/browser_window_controller.mm

Issue 22694002: InstantExtended: Nuke InstantOverlayController. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/browser_window_controller.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm
index bef4fa989d55a8dd1a622fc8e32b1e93301225da..75a97b8d9cf651c6a20048deffc38fcd8bdecf86 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller.mm
@@ -1611,8 +1611,6 @@ enum {
[infoBarContainerController_ changeWebContents:contents];
- [overlayableContentsController_ onActivateTabWithContents:contents];
-
[self updateAllowOverlappingViews:[self inPresentationMode]];
}
@@ -1951,27 +1949,6 @@ willAnimateFromState:(BookmarkBar::State)oldState
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 {

Powered by Google App Engine
This is Rietveld 408576698