Mac/clang: Possibly contentious changes.

chrome/browser/cocoa/hover_close_button.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.
 
 #import "chrome/browser/cocoa/hover_close_button.h"
 
 #include "app/l10n_util.h"
 #include "base/nsimage_cache_mac.h"
 #include "grit/generated_resources.h"
 
 namespace  {
 
-const NSString* kNormalImageString = @"close_bar.pdf";
-const NSString* kHoverImageString = @"close_bar_h.pdf";
-const NSString* kPressedImageString = @"close_bar_p.pdf";
+NSString* const kNormalImageString = @"close_bar.pdf";
+NSString* const kHoverImageString = @"close_bar_h.pdf";
+NSString* const kPressedImageString = @"close_bar_p.pdf";
 
-}
+}  // namespace
 
 @implementation HoverCloseButton
 
 - (id)initWithFrame:(NSRect)frameRect {
   if ((self = [super initWithFrame:frameRect])) {
     [self commonInit];
   }
   return self;
 }
 
@@ skipping 80 matching lines @@
         kHoverImageString : kNormalImageString;
     NSImage* newImage = nsimage_cache::ImageNamed(name);
     NSImage* buttonImage = [self image];
     if (![buttonImage isEqual:newImage]) {
       [self setImage:newImage];
     }
   }
 }
 
 @end