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

chrome/browser/ui/cocoa/browser_window_controller_private.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/browser_window_controller_private.h"
 
 #include "base/command_line.h"
 #import "base/memory/scoped_nsobject.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 286 matching lines @@
   // Set indentation.
   [tabStripController_ setIndentForControls:(fullscreen ? 0 :
       [[tabStripController_ class] defaultIndentForControls])];
 
   // TODO(viettrungluu): Seems kind of bad -- shouldn't |-layoutSubviews| do
   // this? Moreover, |-layoutTabs| will try to animate....
   [tabStripController_ layoutTabs];
 
   // Now lay out incognito badge together with the tab strip.
   if (incognitoBadge_.get()) {
-    // Avoid the full-screen button.
-    CGFloat extraPadding = 0;
-    if ([[self window] respondsToSelector:@selector(toggleFullScreen:)]) {
-      NSButton* fullscreenButton =
-          [[self window] standardWindowButton:NSWindowFullScreenButton];
-      if (fullscreenButton)
-        extraPadding += [fullscreenButton frame].size.width;
-    }
-
     // Actually place the badge *above* |maxY|, by +2 to miss the divider.
     NSPoint origin = NSMakePoint(width - NSWidth([incognitoBadge_ frame]) -
-                                     kIncognitoBadgeOffset - extraPadding,
+                                     kIncognitoBadgeOffset,
                                  maxY + 2);
     [incognitoBadge_ setFrameOrigin:origin];
     [incognitoBadge_ setHidden:NO];  // Make sure it's shown.
   }
 
   return maxY;
 }
 
 - (CGFloat)layoutToolbarAtMinX:(CGFloat)minX
                           maxY:(CGFloat)maxY
@@ skipping 207 matching lines @@
 - (void)disableBarVisibilityUpdates {
   // Early escape if there's nothing to do.
   if (!barVisibilityUpdatesEnabled_)
     return;
 
   barVisibilityUpdatesEnabled_ = NO;
   [fullscreenController_ cancelAnimationAndTimers];
 }
 
 - (void)setUpOSFullScreenButton {
-  NSWindow* window = [self window];
-  if ([window respondsToSelector:@selector(toggleFullScreen:)]) {
-    NSWindowCollectionBehavior behavior = [window collectionBehavior];
-    behavior |= NSWindowCollectionBehaviorFullScreenPrimary;
-    [window setCollectionBehavior:behavior];
-
-    NSButton* fullscreenButton =
-        [window standardWindowButton:NSWindowFullScreenButton];
-    [fullscreenButton setAction:@selector(enterFullscreen:)];
-    [fullscreenButton setTarget:self];
-  }
+  // TOOD(rsesek): Properly implement Lion fullscreen <http://crbug.com/74065>.
 }
 
 @end  // @implementation BrowserWindowController(Private)