Mac fullscreen mode (with pkasting).

TEST=Launch Chrome.  Create a 2nd tab.  Close bookmark bar.
Cmd-F11 to enter fullscreen; make sure content is centered and both
  bookmark bar and toolbar are gone.  Make sure menubar gone.
Cmd-Opt-arrows to switch tabs; make sure still OK.
Cmd-F11 to go back; make sure things look normal.
Open bookmark bar.
Cmd-F11; make sure gone.  Cmd-F11 again; make sure it comes back.
Confirm View-->Fullscreen menu item works.
While in fullscreen, Cmd-T to create new tab and click on a fav tile.
  Make sure page loads.
While in fullscreen, try window hotkeys (Cmd-N and Cmd-W) to make sure
  they work.  Cmd-` to switch windows; switch back, then Cmd-F11 to
  undo fullscreen.
Move the mouse to to the top of the screen; make sure menubar appears.
Move the mouse down; make sure menubar goes away.


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

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

1 files changed, 50 insertions, 21 deletions

diff --git a/chrome/browser/cocoa/bookmark_bar_controller.mm b/chrome/browser/cocoa/bookmark_bar_controller.mm
index e3a4bed..d2805ec 100644
--- a/chrome/browser/cocoa/bookmark_bar_controller.mm
+++ b/chrome/browser/cocoa/bookmark_bar_controller.mm
@@ -16,9 +16,9 @@
 #include "skia/ext/skia_utils_mac.h"
 
 @interface BookmarkBarController(Private)
-- (void)applyContentAreaOffset:(BOOL)apply;
+- (void)applyContentAreaOffset:(BOOL)apply immediately:(BOOL)immediately;
 - (void)positionBar;
-- (void)showBookmarkBar:(BOOL)enable;
+- (void)showBookmarkBar:(BOOL)enable immediately:(BOOL)immediately;
 @end
 
 namespace {
@@ -38,13 +38,16 @@ const CGFloat kBookmarkHorizontalPadding = 8.0;
     bookmarkModel_ = profile->GetBookmarkModel();
     contentView_ = content;
     delegate_ = delegate;
+    // Be sure to enable the bar before trying to show it...
+    barIsEnabled_ = YES;
     // Create and initialize the view's position. Show it if appropriate.
     // TODO(jrg): put it in a nib if necessary.
     NSRect frame = NSMakeRect(0, 0, 0, 30);
     bookmarkBarView_ = [[BookmarkBarView alloc] initWithFrame:frame];
     [self positionBar];
-    if (profile->GetPrefs()->GetBoolean(prefs::kShowBookmarkBar))
-      [self showBookmarkBar:YES];
+    preferences_ = profile->GetPrefs();
+    if (preferences_->GetBoolean(prefs::kShowBookmarkBar))
+      [self showBookmarkBar:YES immediately:NO];
     [[[contentView_ window] contentView] addSubview:bookmarkBarView_];
   }
   // Don't pass ourself along until our init is done.
@@ -64,7 +67,7 @@ const CGFloat kBookmarkHorizontalPadding = 8.0;
 - (void)positionBar {
   // Hide or show bar based on initial visibility and set the resize flags.
   [bookmarkBarView_ setAutoresizingMask:NSViewWidthSizable | NSViewMinYMargin];
-  [bookmarkBarView_ setHidden:!barIsVisible_];
+  [bookmarkBarView_ setHidden:!barShouldBeShown_];
 
   // Set the bar's height to zero and position it at the top of the
   // content area, within the window's content view (as opposed to the
@@ -86,16 +89,21 @@ const CGFloat kBookmarkHorizontalPadding = 8.0;
   [bookmarkBarView_ setFrame:barFrame];
 }
 
-// Show or hide the bar based on the value of |enable|. Handles animating the
-// resize of the content view.
-- (void)showBookmarkBar:(BOOL)enable {
-  contentViewHasOffset_ = enable;
-  [bookmarkBarView_ setHidden:enable ? NO : YES];
-  [self applyContentAreaOffset:enable];
-
-  barIsVisible_ = enable;
-  if (enable) {
-    [self loaded:bookmarkModel_];
+// Show or hide the bar based on the value of |show|. Handles
+// animating the resize of the content view.  if |immediately| is YES,
+// make changes immediately instead of using an animator.  If the bar
+// is disabled, do absolutely nothing.  The routine which enables the
+// bar will show it if relevant using other mechanisms (the pref) to
+// determine desired state.
+- (void)showBookmarkBar:(BOOL)show immediately:(BOOL)immediately {
+  if (barIsEnabled_) {
+    contentViewHasOffset_ = show;
+    [bookmarkBarView_ setHidden:show ? NO : YES];
+    [self applyContentAreaOffset:show immediately:immediately];
+    barShouldBeShown_ = show;
+    if (show) {
+      [self loaded:bookmarkModel_];
+    }
   }
 }
 
@@ -103,7 +111,7 @@ const CGFloat kBookmarkHorizontalPadding = 8.0;
 // bookmark bar.  If apply==YES, always make room (the contentView_ is
 // "full size").  If apply==NO we are trying to undo an offset.  If no
 // offset there is nothing to undo.
-- (void)applyContentAreaOffset:(BOOL)apply {
+- (void)applyContentAreaOffset:(BOOL)apply immediately:(BOOL)immediately {
   if (bookmarkBarView_ == nil) {
     // We're too early, but awakeFromNib will call me again.
     return;
@@ -119,20 +127,41 @@ const CGFloat kBookmarkHorizontalPadding = 8.0;
   else
     frame.size.height += kBookmarkBarHeight;
 
-  [[contentView_ animator] setFrame:frame];
+  if (immediately) {
+    [contentView_ setFrame:frame];
+    [contentView_ setNeedsDisplay:YES];
+  } else {
+    [[contentView_ animator] setFrame:frame];
+  }
+
   [bookmarkBarView_ setNeedsDisplay:YES];
   [contentView_ setNeedsDisplay:YES];
 }
 
 - (BOOL)isBookmarkBarVisible {
-  return barIsVisible_;
+  return barShouldBeShown_;
 }
 
 // We don't change a preference; we only change visibility.
 // Preference changing (global state) is handled in
 // BrowserWindowCocoa::ToggleBookmarkBar().
 - (void)toggleBookmarkBar {
-  [self showBookmarkBar:!barIsVisible_];
+  [self showBookmarkBar:!barShouldBeShown_ immediately:NO];
+}
+
+- (void)setBookmarkBarEnabled:(BOOL)enabled {
+  if (enabled) {
+    // Enabling the bar; set enabled then show if needed.
+    barIsEnabled_ = YES;
+    if (preferences_->GetBoolean(prefs::kShowBookmarkBar))
+      [self showBookmarkBar:YES immediately:YES];
+  } else {
+    // Disabling the bar; hide if visible.
+    if ([self isBookmarkBarVisible]) {
+      [self showBookmarkBar:NO immediately:YES];
+    }
+    barIsEnabled_ = NO;
+  }
 }
 
 // Delete all items from the bookmark bar.
@@ -250,8 +279,8 @@ const CGFloat kBookmarkHorizontalPadding = 8.0;
 // TODO(jrg): for now this is brute force.
 - (void)loaded:(BookmarkModel*)model {
   DCHECK(model == bookmarkModel_);
-  // Do nothing if not visible or too early
-  if ((barIsVisible_ == NO) || !model->IsLoaded())
+  // Do nothing if not active or too early
+  if ((barShouldBeShown_ == NO) || !model->IsLoaded())
     return;
   // Else brute force nuke and build.
   const BookmarkNode* node = model->GetBookmarkBarNode();