Index: chrome/browser/cocoa/browser_window_controller.mm |
diff --git a/chrome/browser/cocoa/browser_window_controller.mm b/chrome/browser/cocoa/browser_window_controller.mm |
index d6bd3da0621a6af8a6c8dbb3bf9fbc4ad062c9ce..0a2f33f64d7b5cf087e4e055239f2d808ab28858 100644 |
--- a/chrome/browser/cocoa/browser_window_controller.mm |
+++ b/chrome/browser/cocoa/browser_window_controller.mm |
@@ -38,6 +38,7 @@ |
#import "chrome/browser/cocoa/infobar_container_controller.h" |
#import "chrome/browser/cocoa/sad_tab_controller.h" |
#import "chrome/browser/cocoa/status_bubble_mac.h" |
+#import "chrome/browser/cocoa/tab_contents_controller.h" |
#import "chrome/browser/cocoa/tab_strip_model_observer_bridge.h" |
#import "chrome/browser/cocoa/tab_strip_view.h" |
#import "chrome/browser/cocoa/tab_strip_controller.h" |
@@ -382,6 +383,10 @@ willPositionSheet:(NSWindow*)sheet |
[tabStripController_ removeConstrainedWindow:window]; |
} |
+- (void)updateDevToolsForContents:(TabContents*)contents { |
+ [tabStripController_ updateDevToolsForContents:contents]; |
+} |
+ |
// Called when the user wants to close a window or from the shutdown process. |
// The Browser object is in control of whether or not we're allowed to close. It |
// may defer closing due to several states, such as onUnload handlers needing to |
@@ -874,7 +879,8 @@ willPositionSheet:(NSWindow*)sheet |
// StatusBubble delegate method: tell the status bubble how far above the bottom |
// of the window it should position itself. |
- (float)verticalOffsetForStatusBubble { |
- return verticalOffsetForStatusBubble_; |
+ return verticalOffsetForStatusBubble_ + |
+ [[tabStripController_ activeTabContentsController] devToolsHeight]; |
} |
- (GTMWindowSheetController*)sheetController { |
@@ -1076,7 +1082,6 @@ willPositionSheet:(NSWindow*)sheet |
return controller; |
} |
- |
- (void)insertPlaceholderForTab:(TabView*)tab |
frame:(NSRect)frame |
yStretchiness:(CGFloat)yStretchiness { |