Mac: Hide the bookmark bar in popup windows.

BUG=17625
BUG=23988

Review URL: http://codereview.chromium.org/255096

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28266 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 14 insertions, 1 deletions

diff --git a/chrome/browser/cocoa/browser_window_controller.mm b/chrome/browser/cocoa/browser_window_controller.mm
index 2d34da4..12d7b6c 100644
--- a/chrome/browser/cocoa/browser_window_controller.mm
+++ b/chrome/browser/cocoa/browser_window_controller.mm
@@ -206,6 +206,11 @@ willPositionSheet:(NSWindow*)sheet
                                  positioned:NSWindowBelow
                                  relativeTo:[toolbarController_ view]];
 
+    // Disable the bookmark bar if this window doesn't support them.
+    if (!browser_->SupportsWindowFeature(Browser::FEATURE_BOOKMARKBAR)) {
+      [bookmarkBarController_ setBookmarkBarEnabled:NO];
+    }
+
     // We don't want to try and show the bar before it gets placed in
     // it's parent view, so this step shoudn't be inside the bookmark
     // bar controller's awakeFromNib.
@@ -890,7 +895,9 @@ willPositionSheet:(NSWindow*)sheet
   } else {
     SetSystemUIMode(kUIModeNormal, 0);
     [[[self window] contentView] addSubview:[toolbarController_ view]];
-    [bookmarkBarController_ setBookmarkBarEnabled:YES];
+    if (browser_->SupportsWindowFeature(Browser::FEATURE_BOOKMARKBAR)) {
+      [bookmarkBarController_ setBookmarkBarEnabled:YES];
+    }
   }
 
   // Force a relayout.
diff --git a/chrome/browser/cocoa/browser_window_controller_unittest.mm b/chrome/browser/cocoa/browser_window_controller_unittest.mm
index e4ad364..29a3221 100644
--- a/chrome/browser/cocoa/browser_window_controller_unittest.mm
+++ b/chrome/browser/cocoa/browser_window_controller_unittest.mm
@@ -133,8 +133,13 @@ TEST_F(BrowserWindowControllerTest, TestFullscreen) {
 }
 
 TEST_F(BrowserWindowControllerTest, TestNormal) {
+  // Force the bookmark bar to be shown.
+  browser_helper_.profile()->GetPrefs()->
+      SetBoolean(prefs::kShowBookmarkBar, true);
+
   // Make sure a normal BrowserWindowController is, uh, normal.
   EXPECT_TRUE([controller_ isNormalWindow]);
+  EXPECT_TRUE([controller_ isBookmarkBarVisible]);
 
   // And make sure a controller for a pop-up window is not normal.
   scoped_ptr<Browser> popup_browser(Browser::CreateForPopup(
@@ -143,6 +148,7 @@ TEST_F(BrowserWindowControllerTest, TestNormal) {
                               initWithBrowser:popup_browser.get()
                                 takeOwnership:NO]);
   EXPECT_FALSE([controller_ isNormalWindow]);
+  EXPECT_FALSE([controller_ isBookmarkBarVisible]);
 
   // The created BrowserWindowController gets autoreleased, so make
   // sure we don't also release it.