File dropped off a popup CL

chrome/browser/cocoa/browser_window_controller.mm

 // Copyright (c) 2009 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.
 
 #include <Carbon/Carbon.h>
 
 #include "base/mac_util.h"
 #include "base/scoped_nsdisable_screen_updates.h"
 #import "base/scoped_nsobject.h"
 #include "base/sys_string_conversions.h"
@@ skipping 46 matching lines @@
 - (void)setContentBorderThickness:(CGFloat)b forEdge:(NSRectEdge)e;
 
 - (void)setBottomCornerRounded:(BOOL)rounded;
 
 - (NSRect)_growBoxRect;
 @end
 
 
 @interface BrowserWindowController(Private)
 
-- (void)positionToolbar;
-- (void)removeToolbar;
+- (void)positionBar;
+- (void)removeBar;
 - (void)installIncognitoBadge;
 
 // Leopard's gradient heuristic gets confused by our tabs and makes the title
 // gradient jump when creating a tab that is less than a tab width from the
 // right side of the screen. This function disables Leopard's gradient
 // heuristic.
 - (void)fixWindowGradient;
 
 // Called by the Notification Center whenever the tabContentArea's
 // frame changes.  Re-positions the bookmark bar and the find bar.
@@ skipping 89 matching lines @@
 
     // Create a controller for the toolbar, giving it the toolbar model object
     // and the toolbar view from the nib. The controller will handle
     // registering for the appropriate command state changes from the back-end.
     toolbarController_.reset([[ToolbarController alloc]
                                initWithModel:browser->toolbar_model()
                                     commands:browser->command_updater()
                                      profile:browser->profile()
                               webContentView:[self tabContentArea]
                             bookmarkDelegate:self]);
-    [self positionToolbar];
+    // If we are a pop-up, we have a titlebar and no toolbar.
+    if (!browser_->SupportsWindowFeature(Browser::FEATURE_TOOLBAR) &&
+        browser_->SupportsWindowFeature(Browser::FEATURE_TITLEBAR)) {
+      [toolbarController_ setHasToolbar:NO];
+    }
+    [self positionBar];
     [self fixWindowGradient];
 
     // Create the bridge for the status bubble.
     statusBubble_.reset(new StatusBubbleMac([self window]));
 
 #if 0
     // Move all buttons down two pixels for visual balance.
     // TODO(alcor): remove this if we can't prevent window resize from breaking.
     NSArray* buttons =
         [NSArray arrayWithObjects:
@@ skipping 460 matching lines @@
 }
 
 // Adjust the UI for fullscreen mode.  E.g. when going fullscreen,
 // remove the toolbar.  When stopping fullscreen, add it back in.
 - (void)adjustUIForFullscreen:(BOOL)fullscreen {
   if (fullscreen) {
     // Disable showing of the bookmark bar.  This does not toggle the
     // preference.
     [[toolbarController_ bookmarkBarController] setBookmarkBarEnabled:NO];
     // Make room for more content area.
-    [self removeToolbar];
+    [self removeBar];
     // Hide the menubar, and allow it to un-hide when moving the mouse
     // to the top of the screen.  Does this eliminate the need for an
     // info bubble describing how to exit fullscreen mode?
     SetSystemUIMode(kUIModeAllHidden, kUIOptionAutoShowMenuBar);
   } else {
     SetSystemUIMode(kUIModeNormal, 0);
-    [self positionToolbar];
+    [self positionBar];
     [[toolbarController_ bookmarkBarController] setBookmarkBarEnabled:YES];
   }
 }
 
 - (NSWindow*)fullscreenWindow {
   return [[[FullscreenWindow alloc] initForScreen:[[self window] screen]]
            autorelease];
 }
 
 - (void)setFullscreen:(BOOL)fullscreen {
@@ skipping 99 matching lines @@
 
 - (GTMTheme *)gtm_themeForWindow:(NSWindow*)window {
   return theme_ ? theme_ : [GTMTheme defaultTheme];
 }
 
 @end
 
 @implementation BrowserWindowController (Private)
 
 // If |add| is YES:
-// Position |toolbarView_| below the tab strip, but not as a
-// sibling. The toolbar is part of the window's contentView, mainly
+// Position |barView| below the tab strip, but not as a sibling. The
+// toolbar or titlebar is part of the window's contentView, mainly
 // because we want the opacity during drags to be the same as the web
 // content.  This can be used for either the initial add or a
 // reposition.
 // If |add| is NO:
-// Remove the toolbar from it's parent view (the window's content view).
-// Called when going fullscreen and we need to minimize UI.
-- (void)positionOrRemoveToolbar:(BOOL)add {
+// Remove the toolbar or titlebar from it's parent view (the window's
+// content view).  Called when going fullscreen and we need to
+// minimize UI.
+- (void)positionOrRemoveBar:(BOOL)add {
+  NSView* barView = [toolbarController_ view];
+  NSRect barFrame = [barView frame];
   NSView* contentView = [self tabContentArea];
   NSRect contentFrame = [contentView frame];
-  NSView* toolbarView = [toolbarController_ view];
-  NSRect toolbarFrame = [toolbarView frame];
 
   // Shrink or grow the content area by the height of the toolbar.
   if (add)
-    contentFrame.size.height -= toolbarFrame.size.height;
+    contentFrame.size.height -= barFrame.size.height;
   else
-    contentFrame.size.height += toolbarFrame.size.height;
+    contentFrame.size.height += barFrame.size.height;
   [contentView setFrame:contentFrame];
 
   if (add) {
     // Move the toolbar above the content area, within the window's content view
     // (as opposed to the tab strip, which is a sibling).
-    toolbarFrame.origin.y = NSMaxY(contentFrame);
-    toolbarFrame.origin.x = 0;
-    toolbarFrame.size.width = contentFrame.size.width;
-    [toolbarView setFrame:toolbarFrame];
-    [[[self window] contentView] addSubview:toolbarView];
+    barFrame.origin.y = NSMaxY(contentFrame);
+    barFrame.origin.x = 0;
+    barFrame.size.width = contentFrame.size.width;
+    [barView setFrame:barFrame];
+    [[[self window] contentView] addSubview:barView];
   } else {
-    [toolbarView removeFromSuperview];
+    [barView removeFromSuperview];
   }
 }
 
-- (void)positionToolbar {
-  [self positionOrRemoveToolbar:YES];
+- (void)positionBar {
+  [self positionOrRemoveBar:YES];
 }
 
-- (void)removeToolbar {
-  [self positionOrRemoveToolbar:NO];
+- (void)removeBar {
+  [self positionOrRemoveBar:NO];
 }
 
 // If the browser is in incognito mode, install the image view to decorate
 // the window at the upper right. Use the same base y coordinate as the
 // tab strip.
 - (void)installIncognitoBadge {
   if (!browser_->profile()->IsOffTheRecord())
     return;
 
   static const float kOffset = 4;
@@ skipping 219 matching lines @@
   NSColor* toolbarButtonBorderColor = toolbarButtonIconColor;
   [theme setValue:toolbarButtonBorderColor
      forAttribute:@"borderColor"
             style:GTMThemeStyleToolBar
             state:YES];
 
   return theme;
 }
 @end