Alternate NTP: Don't hide bookmark bar on instant

chrome/browser/ui/cocoa/browser_window_controller.h

 // Copyright (c) 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.
 
 #ifndef CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_
 #define CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_
 
 // A class acting as the Objective-C controller for the Browser
 // object. Handles interactions between Cocoa and the cross-platform
 // code. Each window has a single toolbar and, by virtue of being a
@@ skipping 96 matching lines @@
   // The view controller that manages the incognito badge or the multi-profile
   // avatar icon. The view is always in the view hierarchy, but will be hidden
   // unless it's appropriate to show it.
   scoped_nsobject<AvatarButtonController> avatarButtonController_;
 
   // Lazily created view which draws the background for the floating set of bars
   // in presentation mode (for window types having a floating bar; it remains
   // nil for those which don't).
   scoped_nsobject<NSView> floatingBarBackingView_;
 
-  // Tracks whether the floating bar is above or below the bookmark bar, in
-  // terms of z-order.
-  BOOL floatingBarAboveBookmarkBar_;
-
   // The borderless window used in fullscreen mode.  Lion reuses the original
   // window in fullscreen mode, so this is always nil on Lion.
   scoped_nsobject<NSWindow> fullscreenWindow_;
 
   // Tracks whether presentation mode was entered from fullscreen mode or
   // directly from normal windowed mode.  Used to determine what to do when
   // exiting presentation mode.
   BOOL enteredPresentationModeFromFullscreen_;
 
   // True between -windowWillEnterFullScreen and -windowDidEnterFullScreen.
@@ skipping 25 matching lines @@
 
   // When going fullscreen for a tab, we need to store the URL and the
   // fullscreen type, since we can't show the bubble until
   // -windowDidEnterFullScreen: gets called.
   GURL fullscreenUrl_;
   FullscreenExitBubbleType fullscreenBubbleType_;
 
   // The Extension Command Registry used to determine which keyboard events to
   // handle.
   scoped_ptr<ExtensionKeybindingRegistryCocoa> extension_keybinding_registry_;
+
+  // The offset between the bottom of the toolbar and web contents. This is used

[kuan, 2013/01/17 18:25:51]

nit: s/used/used to/

[sail, 2013/01/17 18:54:55]

Done.

+  // push the web contents below the bookmark bar.
+  CGFloat toolbarToWebContentsOffset_;
 }
 
 // A convenience class method which gets the |BrowserWindowController| for a
 // given window. This method returns nil if no window in the chain has a BWC.
 + (BrowserWindowController*)browserWindowControllerForWindow:(NSWindow*)window;
 
 // A convenience class method which gets the |BrowserWindowController| for a
 // given view.  This is the controller for the window containing |view|, if it
 // is a BWC, or the first controller in the parent-window chain that is a
 // BWC. This method returns nil if no window in the chain has a BWC.
@@ skipping 142 matching lines @@
 // Returns the frame, in Cocoa (unflipped) screen coordinates, of the area where
 // Instant results are.  If Instant is not showing, returns the frame of where
 // it would be.
 - (NSRect)instantFrame;
 
 // Called when the Add Search Engine dialog is closed.
 - (void)sheetDidEnd:(NSWindow*)sheet
          returnCode:(NSInteger)code
             context:(void*)context;
 
+- (void)updateBookmarkStateForInstantPreview;
+
 @end  // @interface BrowserWindowController
 
 
 // Methods having to do with the window type (normal/popup/app, and whether the
 // window has various features; fullscreen and presentation mode methods are
 // separate).
 @interface BrowserWindowController(WindowType)
 
 // Determines whether this controller's window supports a given feature (i.e.,
 // whether a given feature is or can be shown in the window).
@@ skipping 128 matching lines @@
 // |source| rect doesn't fit into |target|.
 - (NSSize)overflowFrom:(NSRect)source
                     to:(NSRect)target;
 
 // The fullscreen exit bubble controller, or nil if the bubble isn't showing.
 - (FullscreenExitBubbleController*)fullscreenExitBubbleController;
 @end  // @interface BrowserWindowController (TestingAPI)
 
 
 #endif  // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_