[Mac] Remove the presentation mode button and its associated action from the tabstrip.

chrome/browser/ui/cocoa/browser_window_controller_private.mm

 // Copyright (c) 2012 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 <cmath>
 
 #include "base/command_line.h"
 #import "base/memory/scoped_nsobject.h"
@@ skipping 76 matching lines @@
 
   DCHECK([previewableContentsController_ activeContainer]);
   DCHECK([[previewableContentsController_ activeContainer] window]);
   tabStripController_.reset([[factory alloc]
       initWithView:[self tabStripView]
         switchView:[previewableContentsController_ activeContainer]
            browser:browser_.get()
           delegate:self]);
 }
 
-- (void)createAndInstallPresentationModeToggleButton {
-  DCHECK(base::mac::IsOSLionOrLater());
-  if (presentationModeToggleButton_.get())
-    return;
-
-  // TODO(rohitrao): Make this button prettier.
-  presentationModeToggleButton_.reset(
-      [[NSButton alloc] initWithFrame:NSMakeRect(0, 0, 25, 25)]);
-  NSButton* button = presentationModeToggleButton_.get();
-  [button setButtonType:NSMomentaryLightButton];
-  [button setBezelStyle:NSRegularSquareBezelStyle];
-  [button setBordered:NO];
-  [[button cell] setHighlightsBy:NSContentsCellMask];
-  [[button cell] setShowsStateBy:NSContentsCellMask];
-  [button setImage:[NSImage imageNamed:NSImageNameIChatTheaterTemplate]];
-  [button setTarget:self];
-  [button setAction:@selector(togglePresentationModeForLionOrLater:)];
-  [[[[self window] contentView] superview] addSubview:button];
-}
-
 - (void)saveWindowPositionIfNeeded {
   if (!chrome::ShouldSaveWindowPlacement(browser_.get()))
     return;
 
   // If we're in fullscreen mode, save the position of the regular window
   // instead.
   NSWindow* window = [self isFullscreen] ? savedRegularWindow_ : [self window];
 
   // Window positions are stored relative to the origin of the primary monitor.
   NSRect monitorFrame = [[[NSScreen screens] objectAtIndex:0] frame];
@@ skipping 93 matching lines @@
 
   BOOL inPresentationMode = [self inPresentationMode];
   CGFloat floatingBarHeight = [self floatingBarHeight];
   // In presentation mode, |yOffset| accounts for the sliding position of the
   // floating bar and the extra offset needed to dodge the menu bar.
   CGFloat yOffset = inPresentationMode ?
       (std::floor((1 - floatingBarShownFraction_) * floatingBarHeight) -
           [presentationModeController_ floatingBarVerticalOffset]) : 0;
   CGFloat maxY = NSMaxY(contentBounds) + yOffset;
 
-  CGFloat overlayMaxY =
-      NSMaxY([window frame]) +
-      std::floor((1 - floatingBarShownFraction_) * floatingBarHeight);
-  [self layoutPresentationModeToggleAtOverlayMaxX:NSMaxX([window frame])
-                                      overlayMaxY:overlayMaxY];
-
   if ([self hasTabStrip]) {
     // If we need to lay out the top tab strip, replace |maxY| with a higher
     // value, and then lay out the tab strip.
     NSRect windowFrame = [contentView convertRect:[window frame] fromView:nil];
     maxY = NSHeight(windowFrame) + yOffset;
     maxY = [self layoutTabStripAtMaxY:maxY
                                 width:width
                            fullscreen:[self isFullscreen]];
   }
 
@@ skipping 63 matching lines @@
     totalHeight += NSHeight([[toolbarController_ view] frame]) +
                    kLocBarTopInset + kLocBarBottomInset;
   }
 
   if (![self placeBookmarkBarBelowInfoBar])
     totalHeight += NSHeight([[bookmarkBarController_ view] frame]);
 
   return totalHeight;
 }
 
-- (void)layoutPresentationModeToggleAtOverlayMaxX:(CGFloat)maxX
-                                      overlayMaxY:(CGFloat)maxY {
-  // Lay out the presentation mode toggle button at the very top of the
-  // tab strip.
-  if ([self shouldShowPresentationModeToggle]) {
-    [self createAndInstallPresentationModeToggleButton];
-
-    NSPoint origin =
-        NSMakePoint(maxX - NSWidth([presentationModeToggleButton_ frame]),
-                    maxY - NSHeight([presentationModeToggleButton_ frame]));
-    [presentationModeToggleButton_ setFrameOrigin:origin];
-  } else {
-    [presentationModeToggleButton_ removeFromSuperview];
-    presentationModeToggleButton_.reset();
-  }
-}
-
 - (CGFloat)layoutTabStripAtMaxY:(CGFloat)maxY
                           width:(CGFloat)width
                      fullscreen:(BOOL)fullscreen {
   // Nothing to do if no tab strip.
   if (![self hasTabStrip])
     return maxY;
 
   NSView* tabStripView = [self tabStripView];
   CGFloat tabStripHeight = NSHeight([tabStripView frame]);
   maxY -= tabStripHeight;
@@ skipping 580 matching lines @@
 - (void)disableBarVisibilityUpdates {
   // Early escape if there's nothing to do.
   if (!barVisibilityUpdatesEnabled_)
     return;
 
   barVisibilityUpdatesEnabled_ = NO;
   [presentationModeController_ cancelAnimationAndTimers];
 }
 
 @end  // @implementation BrowserWindowController(Private)