[Mac] Refactor the fullscreen code to move logic from BWC into FullscreenCont...

chrome/browser/cocoa/browser_window_controller.mm

 // Copyright (c) 2010 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/browser_window_controller.h"
 
 #include <Carbon/Carbon.h>
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_mac.h"
@@ skipping 428 matching lines @@
 - (void)windowDidBecomeMain:(NSNotification*)notification {
   BrowserList::SetLastActive(browser_.get());
   [self saveWindowPositionIfNeeded];
 
   // TODO(dmaclach): Instead of redrawing the whole window, views that care
   // about the active window state should be registering for notifications.
   [[self window] setViewsNeedDisplay:YES];
 
   // TODO(viettrungluu): For some reason, the above doesn't suffice.
   if ([self isFullscreen])
-    [floatingBarBackingView_ setNeedsDisplay:YES];  // Okay even if nil.
+    [[fullscreenController_ floatingBarBackingView] setNeedsDisplay:YES];
 }
 
 - (void)windowDidResignMain:(NSNotification*)notification {
   // TODO(dmaclach): Instead of redrawing the whole window, views that care
   // about the active window state should be registering for notifications.
   [[self window] setViewsNeedDisplay:YES];
 
   // TODO(viettrungluu): For some reason, the above doesn't suffice.
   if ([self isFullscreen])
-    [floatingBarBackingView_ setNeedsDisplay:YES];  // Okay even if nil.
+    [[fullscreenController_ floatingBarBackingView] setNeedsDisplay:YES];
 }
 
 // Called when we are activated (when we gain focus).
 - (void)windowDidBecomeKey:(NSNotification*)notification {
   // We need to activate the controls (in the "WebView"). To do this, get the
   // selected TabContents's RenderWidgetHostViewMac and tell it to activate.
   if (TabContents* contents = browser_->GetSelectedTabContents()) {
     if (RenderWidgetHostView* rwhv = contents->GetRenderWidgetHostView())
       rwhv->SetActive(true);
   }
@@ skipping 791 matching lines @@
 
   // Place the find bar immediately below the toolbar/attached bookmark bar. In
   // fullscreen mode, it hangs off the top of the screen when the bar is hidden.
   CGFloat maxY = [self placeBookmarkBarBelowInfoBar] ?
       NSMinY([[toolbarController_ view] frame]) :
       NSMinY([[bookmarkBarController_ view] frame]);
   CGFloat maxWidth = NSWidth([contentView frame]);
   [findBarCocoaController_ positionFindBarViewAtMaxY:maxY maxWidth:maxWidth];
 }
 
-- (NSWindow*)createFullscreenWindow {
-  return [[[FullscreenWindow alloc] initForScreen:[[self window] screen]]
-           autorelease];
-}
-
 - (NSInteger)numberOfTabs {
   // count() includes pinned tabs (both live and phantom).
   return browser_->tabstrip_model()->count();
 }
 
 - (BOOL)hasLiveTabs {
   return browser_->tabstrip_model()->HasNonPhantomTabs();
 }
 
 - (NSString*)selectedTabTitle {
@@ skipping 423 matching lines @@
   scoped_nsobject<NSView> contentView([[window contentView] retain]);
   // Disable autoresizing of subviews while we move views around. This prevents
   // spurious renderer resizes.
   [contentView setAutoresizesSubviews:NO];
   [contentView removeFromSuperview];
 
   NSWindow* destWindow = nil;
   if (fullscreen) {
     DCHECK(!savedRegularWindow_);
     savedRegularWindow_ = [window retain];
-    destWindow = [self createFullscreenWindow];
+    destWindow = [fullscreenController_ window];
   } else {
     DCHECK(savedRegularWindow_);
     destWindow = [savedRegularWindow_ autorelease];
     savedRegularWindow_ = nil;
   }
   DCHECK(destWindow);
 
   // Have to do this here, otherwise later calls can crash because the window
   // has no delegate.
   [window setDelegate:nil];
@@ skipping 60 matching lines @@
 - (void)resizeFullscreenWindow {
   DCHECK([self isFullscreen]);
   if (![self isFullscreen])
     return;
 
   NSWindow* window = [self window];
   [window setFrame:[[window screen] frame] display:YES];
   [self layoutSubviews];
 }
 
-- (CGFloat)floatingBarShownFraction {
-  return floatingBarShownFraction_;
-}
-
-- (void)setFloatingBarShownFraction:(CGFloat)fraction {
-  floatingBarShownFraction_ = fraction;
+- (void)floatingBarShownFractionChanged {
   [self layoutSubviews];
 }
 
 - (BOOL)isBarVisibilityLockedForOwner:(id)owner {
   DCHECK(owner);
   DCHECK(barVisibilityLocks_);
   return [barVisibilityLocks_ containsObject:owner];
 }
 
 - (void)lockBarVisibilityForOwner:(id)owner
@@ skipping 74 matching lines @@
 
 - (BOOL)supportsBookmarkBar {
   return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
 }
 
 - (BOOL)isNormalWindow {
   return browser_->type() == Browser::TYPE_NORMAL;
 }
 
 @end  // @implementation BrowserWindowController(WindowType)