Alternate NTP: Don't hide bookmark bar on instant

chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller.mm

 // Copyright 2011 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/tab_contents/previewable_contents_controller.h"
 
 #include "base/mac/bundle_locations.h"
+#include "chrome/browser/ui/cocoa/browser_window_controller.h"
 #include "chrome/browser/ui/cocoa/tab_contents/instant_preview_controller_mac.h"
 #include "chrome/browser/ui/cocoa/tab_contents/preview_drop_shadow_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 
 @interface PreviewableContentsController()
 - (void)viewDidResize:(NSNotification*)note;
 - (void)layoutViews;
 - (CGFloat)previewHeightInPixels;
 @end
 
 @implementation PreviewableContentsController
 
 @synthesize drawDropShadow = drawDropShadow_;
+@synthesize previewOffset = previewOffset_;
+@synthesize activeContainerOffset = activeContainerOffset_;
 
 - (id)initWithBrowser:(Browser*)browser
      windowController:(BrowserWindowController*)windowController {
   if ((self = [super init])) {
+    windowController_ = windowController;
     scoped_nsobject<NSView> view([[NSView alloc] initWithFrame:NSZeroRect]);
     [view setAutoresizingMask:NSViewHeightSizable | NSViewWidthSizable];
     [view setAutoresizesSubviews:NO];
     [[NSNotificationCenter defaultCenter]
         addObserver:self
            selector:@selector(viewDidResize:)
                name:NSViewFrameDidChangeNotification
              object:view];
     [self setView:view];
 
@@ skipping 75 matching lines @@
   dropShadowView_.reset();
 }
 
 - (void)onActivateTabWithContents:(content::WebContents*)contents {
   if (previewContents_ == contents) {
     [previewContents_->GetNativeView() removeFromSuperview];
     previewContents_ = nil;
   }
 }
 
+- (BOOL)isShowingPreview {
+  return previewContents_ != nil;
+}
+
 - (InstantPreviewControllerMac*)instantPreviewController {
   return instantPreviewController_.get();
 }
 
 - (NSView*)activeContainer {
   return activeContainer_.get();
 }
 
 - (NSView*)dropShadowView {
   return dropShadowView_.get();
 }
 
+- (void)setPreviewOffset:(CGFloat)previewOffset {
+  if (previewOffset_ == previewOffset)
+    return;
+
+  previewOffset_ = previewOffset;
+  [self layoutViews];
+}
+
+- (void)setActiveContainerOffset:(CGFloat)activeContainerOffset {
+  if (activeContainerOffset_ == activeContainerOffset)
+    return;
+
+  activeContainerOffset_ = activeContainerOffset;
+  [self layoutViews];
+}
+
 - (void)viewDidResize:(NSNotification*)note {
   [self layoutViews];
 }
 
 - (void)layoutViews {
   NSRect bounds = [[self view] bounds];
 
   if (previewContents_) {
     NSRect previewFrame = bounds;
     previewFrame.size.height = [self previewHeightInPixels];
-    previewFrame.origin.y = NSMaxY(bounds) - NSHeight(previewFrame);
+    previewFrame.origin.y =
+        NSMaxY(bounds) - NSHeight(previewFrame) - previewOffset_;
     [previewContents_->GetNativeView() setFrame:previewFrame];
 
     if (dropShadowView_) {
       NSRect dropShadowFrame = bounds;
       dropShadowFrame.size.height = [PreviewDropShadowView preferredHeight];
       dropShadowFrame.origin.y =
           NSMinY(previewFrame) - NSHeight(dropShadowFrame);
       [dropShadowView_ setFrame:dropShadowFrame];
     }
   }
 
-  [activeContainer_ setFrame:bounds];
+  NSRect activeFrame = bounds;
+  activeFrame.size.height -= activeContainerOffset_;
+  [activeContainer_ setFrame:activeFrame];
 }
 
 - (CGFloat)previewHeightInPixels {
-  CGFloat height = NSHeight([[self view] bounds]);
+  CGFloat height = NSHeight([[self view] bounds]) - previewOffset_;
   switch (previewHeightUnits_) {
     case INSTANT_SIZE_PERCENT:
       return std::min(height, (height * previewHeight_) / 100);
     case INSTANT_SIZE_PIXELS:
       return std::min(height, previewHeight_);
   }
 }
 
 @end