| 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 12d7b6cde9b35d79b0a720d1b6d76f5aab2e259f..3951e4c1dc2356393e1214fdf61de7d474ea96e4 100644
|
| --- a/chrome/browser/cocoa/browser_window_controller.mm
|
| +++ b/chrome/browser/cocoa/browser_window_controller.mm
|
| @@ -24,6 +24,7 @@
|
| #import "chrome/browser/cocoa/bookmark_editor_controller.h"
|
| #import "chrome/browser/cocoa/browser_window_cocoa.h"
|
| #import "chrome/browser/cocoa/browser_window_controller.h"
|
| +#import "chrome/browser/cocoa/chrome_browser_window.h"
|
| #import "chrome/browser/cocoa/download_shelf_controller.h"
|
| #import "chrome/browser/cocoa/extension_shelf_controller.h"
|
| #import "chrome/browser/cocoa/find_bar_cocoa_controller.h"
|
| @@ -360,7 +361,8 @@ willPositionSheet:(NSWindow*)sheet
|
| // message, since it just means that a menu extra (on the "system status bar")
|
| // was activated; we'll get another |-windowDidResignKey| if we ever really
|
| // lose key window status.
|
| - if ([NSApp isActive] && ([NSApp keyWindow] == window_))
|
| + if ([NSApp isActive] &&
|
| + ([NSApp keyWindow] == static_cast<NSWindow*>(window_)))
|
| return;
|
|
|
| // We need to deactivate the controls (in the "WebView"). To do this, get the
|
| @@ -1239,6 +1241,10 @@ willPositionSheet:(NSWindow*)sheet
|
| }
|
| DCHECK_GE(maxY, minY);
|
|
|
| + // Suppress title drawing for normal windows (popups use normal
|
| + // window title bars).
|
| + [window_ setShouldHideTitle:[self isNormalWindow]];
|
| +
|
| // Place the toolbar at the top of the reserved area, but only if we're not in
|
| // fullscreen mode.
|
| NSView* toolbarView = [toolbarController_ view];
|
|
|