Mac/clang: Uncontentious fixes.

chrome/browser/cocoa/extensions/browser_action_button.mm

 // Copyright (c) 2010 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/cocoa/extensions/browser_action_button.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/logging.h"
@@ skipping 24 matching lines @@
 
 static const CGFloat kBrowserActionBadgeOriginYOffset = 5;
 
 // Since the container is the maximum height of the toolbar, we have to move the
 // buttons up by this amount in order to have them look vertically centered
 // within the toolbar.
 static const CGFloat kBrowserActionOriginYOffset = 5;
 
 // The size of each button on the toolbar.
 static const CGFloat kBrowserActionHeight = 27;
-extern const CGFloat kBrowserActionWidth = 29;
+const CGFloat kBrowserActionWidth = 29;
 
 namespace {
 const CGFloat kAnimationDuration = 0.2;
 const CGFloat kShadowOffset = 2.0;
 }  // anonymous namespace
 
 // A helper class to bridge the asynchronous Skia bitmap loading mechanism to
 // the extension's button.
 class ExtensionImageTrackerBridge : public NotificationObserver,
                                     public ImageLoadingTracker::Observer {
@@ skipping 118 matching lines @@
 
 - (void)mouseDragged:(NSEvent*)theEvent {
   if (!dragCouldStart_)
     return;
 
   if (!isBeingDragged_) {
     // The start of a drag. Position the button above all others.
     [[self superview] addSubview:self positioned:NSWindowAbove relativeTo:nil];
   }
   isBeingDragged_ = YES;
-  NSPoint location = [self convertPoint:[theEvent locationInWindow]
-                               fromView:nil];
   NSRect buttonFrame = [self frame];
   // TODO(andybons): Constrain the buttons to be within the container.
   // Clamp the button to be within its superview along the X-axis.
   buttonFrame.origin.x += [theEvent deltaX];
   [self setFrame:buttonFrame];
   [self setNeedsDisplay:YES];
   [[NSNotificationCenter defaultCenter]
       postNotificationName:kBrowserActionButtonDraggingNotification
       object:self];
 }
@@ skipping 141 matching lines @@
 - (void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView*)controlView {
   [NSGraphicsContext saveGraphicsState];
   [self setIconShadow];
   [super drawInteriorWithFrame:cellFrame inView:controlView];
   cellFrame.origin.y += kBrowserActionBadgeOriginYOffset;
   [self drawBadgeWithinFrame:cellFrame];
   [NSGraphicsContext restoreGraphicsState];
 }
 
 @end