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

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

Issue 11876036: Alternate NTP: Don't hide bookmark bar on instant (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tests actually pass! Created 7 years, 11 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.h
diff --git a/chrome/browser/ui/cocoa/browser_window_controller.h b/chrome/browser/ui/cocoa/browser_window_controller.h
index c7932e1a4e82be119473347c5e143bbb352e2ec0..6e17a5ccee56c4793d74a56e8aa173f31cdd6d01 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller.h
+++ b/chrome/browser/ui/cocoa/browser_window_controller.h
@@ -114,10 +114,6 @@ class WebContents;
// 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_;
@@ -163,6 +159,10 @@ class WebContents;
// 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
+ // to push the web contents below the bookmark bar.
+ CGFloat toolbarToWebContentsOffset_;
}
// A convenience class method which gets the |BrowserWindowController| for a
@@ -195,6 +195,9 @@ class WebContents;
// Return a weak pointer to the tab strip controller.
- (TabStripController*)tabStripController;
+// Return a weak pointer to the find bar controller.
+- (FindBarCocoaController*)findBarCocoaController;
+
// Access the ObjC controller that contains the infobars.
- (InfoBarContainerController*)infoBarContainerController;
@@ -204,6 +207,12 @@ class WebContents;
// Access the C++ bridge object representing the location bar.
- (LocationBarViewMac*)locationBarBridge;
+// Returns a weak pointer to the floating bar backing view;
+- (NSView*)floatingBarBackingView;
+
+// Returns a weak pointer to the previewable contents controller.
+- (PreviewableContentsController*)previewableContentsController;
+
// Access the Profile object that backs this Browser.
- (Profile*)profile;
@@ -325,6 +334,8 @@ class WebContents;
returnCode:(NSInteger)code
context:(void*)context;
+- (void)updateBookmarkBarStateForInstantPreview;
+
@end // @interface BrowserWindowController

Powered by Google App Engine
This is Rietveld 408576698