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

chrome/browser/cocoa/toolbar_controller_unittest.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 <Cocoa/Cocoa.h>
 
 #import "base/scoped_nsobject.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/cocoa/browser_test_helper.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
@@ skipping 56 matching lines @@
 TEST_F(ToolbarControllerTest, InitialState) {
   CommandUpdater* updater = helper_.browser()->command_updater();
   CompareState(updater, [bar_ toolbarViews]);
 }
 
 // Make sure awakeFromNib created a bookmarkBarController
 TEST_F(ToolbarControllerTest, AwakeFromNibCreatesBMBController) {
   EXPECT_TRUE([bar_ bookmarkBarController]);
 }
 
+// Make sure a "titlebar only" toolbar works
+TEST_F(ToolbarControllerTest, TitlebarOnly) {
+  NSView* view = [bar_ view];
+  EXPECT_TRUE([bar_ bookmarkBarController]);
+
+  [bar_ setHasToolbar:NO];
+  EXPECT_NE(view, [bar_ view]);
+  EXPECT_FALSE([bar_ bookmarkBarController]);
+
+  [bar_ setHasToolbar:YES];
+  EXPECT_EQ(view, [bar_ view]);
+  EXPECT_TRUE([bar_ bookmarkBarController]);
+
+  // Leave it off to make sure that's fine
+  [bar_ setHasToolbar:NO];
+}
+
 
 // Make some changes to the enabled state of a few of the buttons and ensure
 // that we're still in sync.
 TEST_F(ToolbarControllerTest, UpdateEnabledState) {
   CommandUpdater* updater = helper_.browser()->command_updater();
   EXPECT_FALSE(updater->IsCommandEnabled(IDC_BACK));
   EXPECT_FALSE(updater->IsCommandEnabled(IDC_FORWARD));
   updater->UpdateCommandEnabled(IDC_BACK, true);
   updater->UpdateCommandEnabled(IDC_FORWARD, true);
   CompareState(updater, [bar_ toolbarViews]);
@@ skipping 73 matching lines @@
   // Toggle the pref and make sure the buttons changed state and the other
   // views moved (or in the case of the location bar, it changed width).
   prefs->SetBoolean(prefs::kShowPageOptionsButtons, !showButtons);
   EXPECT_EQ(showButtons, [pageButton isHidden]);
   EXPECT_EQ(showButtons, [wrenchButton isHidden]);
   EXPECT_NE(NSMinX(originalGoFrame), NSMinX([goButton frame]));
   EXPECT_NE(NSWidth(originalLocationBarFrame), NSWidth([locationBar frame]));
 }
 
 }  // namespace