Mac: fix/implement app windows (not app mode), popups, drawing; refactor code.

chrome/browser/cocoa/gradient_button_cell.mm

 // Copyright (c) 2009 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.
 
 #include "base/logging.h"
 #import "base/scoped_nsobject.h"
 #include "chrome/browser/cocoa/gradient_button_cell.h"
 #import "third_party/GTM/AppKit/GTMTheme.h"
 #import "third_party/GTM/AppKit/GTMNSColor+Luminance.h"
 
 @interface GradientButtonCell (Private)
 - (void)sharedInit;
 - (void)drawUnderlayImageWithFrame:(NSRect)cellFrame
                             inView:(NSView*)controlView;
 
 // Get drawing parameters for a given cell frame in a given view. The inner
 // frame is the one required by |-drawInteriorWithFrame:inView:|. The inner and
 // outer paths are the ones required by |-drawBorderAndFillForTheme:...|. The
 // outer path also gives the area in which to clip. Any of the |return...|
 // arguments may be NULL (in which case the given parameter won't be returned).
 // If |returnInnerPath| or |returnOuterPath|, |*returnInnerPath| or
 // |*returnOuterPath| should be nil, respectively.
 - (void)getDrawParamsForFrame:(NSRect)cellFrame
                        inView:(NSView*)controlView
                    innerFrame:(NSRect*)returnInnerFrame
                     innerPath:(NSBezierPath**)returnInnerPath
-                    outerPath:(NSBezierPath**)returnOuterPath
                      clipPath:(NSBezierPath**)returnClipPath;
 @end
 
 static const NSTimeInterval kAnimationShowDuration = 0.2;
 static const NSTimeInterval kAnimationHideDuration = 0.4;
 
 @implementation GradientButtonCell
 @synthesize hoverAlpha = hoverAlpha_;
 
 - (void)adjustHoverValue {
@@ skipping 131 matching lines @@
       [[self controlView] removeTrackingArea:trackingArea_];
       trackingArea_.reset(nil);
       isMouseInside_ = NO;
     }
   }
 }
 
 // TODO(viettrungluu): clean up/reorganize.
 - (void)drawBorderAndFillForTheme:(GTMTheme*)theme
                       controlView:(NSView*)controlView
-                        outerPath:(NSBezierPath*)outerPath
                         innerPath:(NSBezierPath*)innerPath
               showClickedGradient:(BOOL)showClickedGradient
             showHighlightGradient:(BOOL)showHighlightGradient
                        hoverAlpha:(CGFloat)hoverAlpha
                            active:(BOOL)active
                         cellFrame:(NSRect)cellFrame
                   defaultGradient:(NSGradient*)defaultGradient {
   BOOL isFlatButton = [self showsBorderOnlyWhileMouseInside];
 
   // For flat (unbordered when not hovered) buttons, never use the toolbar
@@ skipping 82 matching lines @@
   [innerPath setLineWidth:1];
   [innerPath stroke];
 }
 
 // TODO(viettrungluu): clean this up.
 // (Private)
 - (void)getDrawParamsForFrame:(NSRect)cellFrame
                        inView:(NSView*)controlView
                    innerFrame:(NSRect*)returnInnerFrame
                     innerPath:(NSBezierPath**)returnInnerPath
-                    outerPath:(NSBezierPath**)returnOuterPath
                      clipPath:(NSBezierPath**)returnClipPath {
   // Constants from Cole.  Will kConstant them once the feedback loop
   // is complete.
   NSRect drawFrame = NSInsetRect(cellFrame, 1.5, 1.5);
   NSRect innerFrame = NSInsetRect(cellFrame, 2, 1);
   const CGFloat radius = 3.5;
 
   ButtonType type = [[(NSControl*)controlView cell] tag];
   switch (type) {
     case kMiddleButtonType:
@@ skipping 16 matching lines @@
 
   // Return results if |return...| not null.
   if (returnInnerFrame)
     *returnInnerFrame = innerFrame;
   if (returnInnerPath) {
     DCHECK(*returnInnerPath == nil);
     *returnInnerPath = [NSBezierPath bezierPathWithRoundedRect:drawFrame
                                                        xRadius:radius
                                                        yRadius:radius];
   }
-  if (returnOuterPath) {
-    DCHECK(*returnOuterPath == nil);
-    NSRect outerPathRect = NSInsetRect(drawFrame, -1, -1);
-    *returnOuterPath = [NSBezierPath bezierPathWithRoundedRect:outerPathRect
-                                                       xRadius:radius + 1
-                                                       yRadius:radius + 1];
-  }
   if (returnClipPath) {
     DCHECK(*returnClipPath == nil);
     NSRect clipPathRect = NSInsetRect(drawFrame, -0.5, -0.5);
     *returnClipPath = [NSBezierPath bezierPathWithRoundedRect:clipPathRect
                                                       xRadius:radius + 0.5
                                                       yRadius:radius + 0.5];
   }
 }
 
 // TODO(viettrungluu): clean this up.
 - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView*)controlView {
   NSRect innerFrame;
   NSBezierPath* innerPath = nil;
-  NSBezierPath* outerPath = nil;
   [self getDrawParamsForFrame:cellFrame
                        inView:controlView
                    innerFrame:&innerFrame
                     innerPath:&innerPath
-                    outerPath:&outerPath
                      clipPath:NULL];
 
   BOOL pressed = [self isHighlighted];
   NSWindow* window = [controlView window];
   BOOL active = [window isKeyWindow] || [window isMainWindow];
 
   GTMTheme* theme = [controlView gtm_theme];
 
   // Stroke the borders and appropriate fill gradient. If we're borderless,
   // the only time we want to draw the inner gradient is if we're highlighted.
   if (([self isBordered] && ![self showsBorderOnlyWhileMouseInside]) ||
       pressed ||
       [self isMouseInside]) {
 
     [self drawBorderAndFillForTheme:theme
                         controlView:controlView
-                          outerPath:outerPath
                           innerPath:innerPath
                 showClickedGradient:pressed
               showHighlightGradient:[self isHighlighted]
                          hoverAlpha:[self hoverAlpha]
                              active:active
                           cellFrame:cellFrame
                     defaultGradient:nil];
   }
 
   // If this is the left side of a segmented button, draw a slight shadow.
@@ skipping 77 matching lines @@
   }
 }
 
 - (NSBezierPath*)clipPathForFrame:(NSRect)cellFrame
                            inView:(NSView*)controlView {
   NSBezierPath* boundingPath = nil;
   [self getDrawParamsForFrame:cellFrame
                        inView:controlView
                    innerFrame:NULL
                     innerPath:NULL
-                    outerPath:NULL
                      clipPath:&boundingPath];
   return boundingPath;
 }
 
 @end