Merge 92728 - [Mac] Remove the Lion fullscreen button until proper fullscreen support is added.

chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm

 // Copyright (c) 2011 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/ui/cocoa/tabs/tab_strip_controller.h"
 
 #import <QuartzCore/QuartzCore.h>
 
 #include <limits>
 #include <string>
@@ skipping 857 matching lines @@
   // (taken care of by |MAX()| when calculating tab sizes).
   CGFloat availableSpace = 0;
   if (verticalLayout_) {
     availableSpace = NSHeight([tabStripView_ bounds]);
   } else {
     if ([self inRapidClosureMode]) {
       availableSpace = availableResizeWidth_;
     } else {
       availableSpace = NSWidth([tabStripView_ frame]);
 
-      // Account for the widths of the new tab button, the incognito badge, and
-      // the fullscreen button if any/all are present.
+      // Account for the widths of the new tab button or the avatar, if any/all
+      // are present.
       availableSpace -= NSWidth([newTabButton_ frame]) + kNewTabButtonOffset;
       if (browser_->profile()->IsOffTheRecord())
         availableSpace -= kIncognitoBadgeTabStripShrink;
-      if ([[tabStripView_ window]
-          respondsToSelector:@selector(toggleFullScreen:)]) {
-        NSButton* fullscreenButton = [[tabStripView_ window]
-            standardWindowButton:NSWindowFullScreenButton];
-        if (fullscreenButton)
-          availableSpace -= [fullscreenButton frame].size.width;
-      }
     }
     availableSpace -= [self indentForControls];
   }
 
   // This may be negative, but that's okay (taken care of by |MAX()| when
   // calculating tab sizes). "mini" tabs in horizontal mode just get a special
   // section, they don't change size.
   CGFloat availableSpaceForNonMini = availableSpace;
   if (!verticalLayout_) {
       availableSpaceForNonMini -=
@@ skipping 1228 matching lines @@
   }
 
   std::string profileName = browser_->profile()->GetPrefs()->GetString(
       prefs::kGoogleServicesUsername);
   [profileMenuButton_ setProfileDisplayName:
       [NSString stringWithUTF8String:profileName.c_str()]];
   [profileMenuButton_ setHidden:NO];
 }
 
 @end