Mac pop-up window happier-ness....

chrome/browser/cocoa/toolbar_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.
 
 #import "chrome/browser/cocoa/toolbar_controller.h"
 
 #include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"
 #import "chrome/browser/cocoa/location_bar_view_mac.h"
@@ skipping 68 matching lines @@
      webContentView:(NSView*)webContentView
    bookmarkDelegate:(id<BookmarkURLOpener>)delegate {
   DCHECK(model && commands && profile);
   if ((self = [super initWithNibName:@"Toolbar"
                               bundle:mac_util::MainAppBundle()])) {
     toolbarModel_ = model;
     commands_ = commands;
     profile_ = profile;
     bookmarkBarDelegate_ = delegate;
     webContentView_ = webContentView;
+    hasToolbar_ = YES;
 
     // Register for notifications about state changes for the toolbar buttons
     commandObserver_.reset(new CommandObserverBridge(self, commands));
     commandObserver_->ObserveCommand(IDC_BACK);
     commandObserver_->ObserveCommand(IDC_FORWARD);
     commandObserver_->ObserveCommand(IDC_RELOAD);
     commandObserver_->ObserveCommand(IDC_HOME);
     commandObserver_->ObserveCommand(IDC_STAR);
   }
   return self;
 }
 
+- (void)dealloc {
+  // Make sure any code in the base class which assumes [self view] is
+  // the "parent" view continues to work.
+  hasToolbar_ = YES;
+
+  [super dealloc];
+}
+
 // Called after the view is done loading and the outlets have been hooked up.
 // Now we can hook up bridges that rely on UI objects such as the location
 // bar and button state.
 - (void)awakeFromNib {
   [self initCommandStatus:commands_];
   locationBarView_.reset(new LocationBarViewMac(locationBar_, commands_,
                                                 toolbarModel_, profile_));
   [locationBar_ setFont:[NSFont systemFontOfSize:[NSFont systemFontSize]]];
 
   // Register pref observers for the optional home and page/options buttons
@@ skipping 86 matching lines @@
   if (isLoading) {
     imageName = @"stop_Template.pdf";
     tag = IDC_STOP;
   }
   NSImage* stopStartImage = nsimage_cache::ImageNamed(imageName);
   [stopStartImage setTemplate:YES];
   [goButton_ setImage:stopStartImage];
   [goButton_ setTag:tag];
 }
 
+- (void)setHasToolbar:(BOOL)toolbar {
+  [self view];  // force nib loading
+  hasToolbar_ = toolbar;
+
+  // App mode allows turning off the location bar as well.
+  // TODO(???): add more code here when implementing app mode to allow
+  // turning off both toolbar AND location bar.
+
+  // TODO(jrg): add mode code to make the location bar NOT editable
+  // when in a pop-up.
+}
+
+- (NSView*)view {
+  if (hasToolbar_)
+    return [super view];
+  return locationBar_;
+}
+
 - (BookmarkBarController*)bookmarkBarController {
+  // Browser has a FEATURE_BOOKMARKBAR but it is ignored by Safari
+  // when using window.open(); the logic seems to be "if no toolbar,
+  // no bookmark bar".
+  // TODO(jrg): investigate non-Mac Chrome behavior and possibly expand this.
+  if (hasToolbar_ == NO)
+    return nil;
   return bookmarkBarController_.get();
 }
 
 - (id)customFieldEditorForObject:(id)obj {
   if (obj == locationBar_) {
     // Lazilly construct Field editor, Cocoa UI code always runs on the
     // same thread, so there shoudn't be a race condition here.
     if (locationBarFieldEditor_.get() == nil) {
       locationBarFieldEditor_.reset([[LocationBarFieldEditor alloc] init]);
     }
@@ skipping 92 matching lines @@
                    forView:pageButton_];
 }
 
 - (IBAction)showWrenchMenu:(id)sender {
   [NSMenu popUpContextMenu:wrenchMenu_
                  withEvent:[NSApp currentEvent]
                    forView:wrenchButton_];
 }
 
 @end