Mac/clang: Possibly contentious changes.

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"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/cocoa/extensions/extension_action_context_menu.h"
 #import "chrome/browser/cocoa/image_utils.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_action.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/common/notification_type.h"
 #include "gfx/canvas_paint.h"
 #include "gfx/rect.h"
 #include "gfx/size.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"
 
-extern const NSString* kBrowserActionButtonUpdatedNotification =
+NSString* const kBrowserActionButtonUpdatedNotification =
     @"BrowserActionButtonUpdatedNotification";
 
-extern const NSString* kBrowserActionButtonDraggingNotification =
+NSString* const kBrowserActionButtonDraggingNotification =
     @"BrowserActionButtonDraggingNotification";
-extern const NSString* kBrowserActionButtonDragEndNotification =
+NSString* const kBrowserActionButtonDragEndNotification =
     @"BrowserActionButtonDragEndNotification";
 
 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.
@@ skipping 291 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