mac: Add traffic lights to fullscreen mode in Yosemite.

chrome/browser/ui/cocoa/tabs/tab_strip_controller.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/tabs/tab_strip_controller.h"
 
 #import <QuartzCore/QuartzCore.h>
 
 #include <cmath>
 #include <limits>
@@ skipping 2154 matching lines @@
   int modelIndex = tabStripModel_->active_index();
   if (modelIndex < 0)
     return nil;
   NSInteger index = [self indexFromModelIndex:modelIndex];
   if (index < 0 ||
       index >= (NSInteger)[tabContentsArray_ count])
     return nil;
   return [tabContentsArray_ objectAtIndex:index];
 }
 
+- (void)addWindowControls {
+  if (!fullscreenWindowControls_) {
+    // Make the container view.
+    CGFloat height = NSHeight([tabStripView_ frame]);
+    NSRect frame = NSMakeRect(0, 0, self.leftIndentForControls, height);

[Robert Sesek, 2014/09/02 19:01:05]

This file has an overwhelming preference against dot-notation, so I'd avoid it
here.

[erikchen, 2014/09/03 00:31:44]

I removed all instances of dot notation from this method.

+    fullscreenWindowControls_.reset([[NSView alloc] initWithFrame:frame]);
+    [fullscreenWindowControls_
+        setAutoresizingMask:NSViewMaxXMargin | NSViewHeightSizable];
+
+    // Add the traffic light buttons. The horizontal layout was determined by
+    // manual inspection on Yosemite.
+    NSUInteger styleMask = [tabStripView_ window].styleMask;
+    NSButton* closeButton = [NSWindow standardWindowButton:NSWindowCloseButton
+                                              forStyleMask:styleMask];
+
+    // Vertically center the buttons in the tab strip.
+    CGFloat buttonY = floor((height - NSHeight(closeButton.bounds)) / 2);
+    [closeButton setFrameOrigin:NSMakePoint(11, buttonY)];

[Robert Sesek, 2014/09/02 19:01:05]

Pull these magic numbers into method-local magic numbers, at least.

[erikchen, 2014/09/03 00:31:44]

Done.

+    [fullscreenWindowControls_ addSubview:closeButton];
+
+    NSButton* miniaturizeButton =
+        [NSWindow standardWindowButton:NSWindowMiniaturizeButton
+                          forStyleMask:styleMask];
+    [miniaturizeButton setFrameOrigin:NSMakePoint(31, buttonY)];
+    [miniaturizeButton setEnabled:NO];
+    [fullscreenWindowControls_ addSubview:miniaturizeButton];
+
+    NSButton* fullscreenButton =
+        [NSWindow standardWindowButton:NSWindowZoomButton
+                          forStyleMask:styleMask];
+    [fullscreenWindowControls_ addSubview:fullscreenButton];
+    [fullscreenButton setFrameOrigin:NSMakePoint(51, buttonY)];
+  }
+
+  if (![permanentSubviews_ containsObject:fullscreenWindowControls_]) {
+    [self addSubviewToPermanentList:fullscreenWindowControls_];
+    [self regenerateSubviewList];
+  }
+}
+
+- (void)removeWindowControls {
+  if (fullscreenWindowControls_)
+    [permanentSubviews_ removeObject:fullscreenWindowControls_];
+  [self regenerateSubviewList];
+}
+
 - (void)themeDidChangeNotification:(NSNotification*)notification {
   [self setNewTabImages];
 }
 
 - (void)setNewTabImages {
   ThemeService *theme =
       static_cast<ThemeService*>([[tabStripView_ window] themeProvider]);
   if (!theme)
     return;
 
@@ skipping 44 matching lines @@
 }
 
 NSRect GetSheetParentBoundsForParentView(NSView* view) {
   // If the devtools view is open, it shrinks the size of the WebContents, so go
   // up the hierarchy to the devtools container view to avoid that. Note that
   // the devtools view is always in the hierarchy even if it is not open or it
   // is detached.
   NSView* devtools_view = [[[view superview] superview] superview];
   return [devtools_view convertRect:[devtools_view bounds] toView:nil];
 }