Rename constants to be unique (mac)

When building using jumbo, files gets merged and constants
with the same name may end up in the same scope and conflict.

This commit solves the issue by renaming the constants to
something more file specific.

Bug: 803406
Change-Id: I70976f012e9be6f395d4bfcc43e785515071ebb3
Reviewed-on: https://chromium-review.googlesource.com/1142783
Commit-Queue: Oscar Johansson <oscarj@opera.com>
Reviewed-by: Avi Drissman <avi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#576511}

chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.mm

@@ -33,7 +33,7 @@ const int kHierarchyButtonTrailingPadding = 4;
 const int kHierarchyButtonLeadingPadding = 11;
 
 const int kIconTextSpacer = 4;
-const int kTrailingPadding = 4;
+const int kTrailingCellPadding = 4;
 const int kIconLeadingPadding = 4;
 
 const int kDefaultFontSize = 12;
@@ -133,9 +133,10 @@ const CGFloat kKernAmount = 0.2;
       NSKernAttributeName : @(kKernAmount),
       NSFontAttributeName : [self fontForBookmarkBarCell],
     }];
-    width += kIconTextSpacer + std::ceil(titleSize.width) + kTrailingPadding;
+    width +=
+        kIconTextSpacer + std::ceil(titleSize.width) + kTrailingCellPadding;
   } else {
-    width += kTrailingPadding;
+    width += kTrailingCellPadding;
   }
   return width;
 }
@@ -383,7 +384,8 @@ const CGFloat kKernAmount = 0.2;
   if ([title length] > 0) {
     CGFloat textWidth =
         [title sizeWithAttributes:[self titleTextAttributes]].width;
-    cellSize.width += kIconTextSpacer + std::ceil(textWidth) + kTrailingPadding;
+    cellSize.width +=
+        kIconTextSpacer + std::ceil(textWidth) + kTrailingCellPadding;
   } else {
     cellSize.width += kIconLeadingPadding;
   }
@@ -415,7 +417,8 @@ const CGFloat kKernAmount = 0.2;
                          ? NSWidth(theRect) - NSMinX(imageRect)  // Un-flip
                          : NSMaxX(imageRect);
   textRect.origin.x = imageEnd + kIconTextSpacer;
-  textRect.size.width = NSWidth(theRect) - NSMinX(textRect) - kTrailingPadding;
+  textRect.size.width =
+      NSWidth(theRect) - NSMinX(textRect) - kTrailingCellPadding;
   if (drawFolderArrow_)
     textRect.size.width -=
         [arrowImage_ size].width + kHierarchyButtonTrailingPadding;

chrome/browser/ui/cocoa/browser/zoom_bubble_controller.mm

@@ -51,7 +51,7 @@ namespace {
 NSTimeInterval gAutoCloseDelay = 1.5;
 
 // The height of the window.
-const CGFloat kWindowHeight = 29.0;
+const CGFloat kZoomBubbleWindowHeight = 29.0;
 
 // Width of the zoom in and zoom out buttons.
 const CGFloat kZoomInOutButtonWidth = 44.0;
@@ -216,7 +216,8 @@ void SetZoomBubbleAutoCloseDelayForTesting(NSTimeInterval time_interval) {
   NSButton* zoomOutButton = [self addButtonWithTitleID:IDS_ZOOM_MINUS2
                                               fontSize:kZoomInOutButtonFontSize
                                                 action:@selector(zoomOut:)];
-  NSRect rect = NSMakeRect(0, 0, kZoomInOutButtonWidth, kWindowHeight);
+  NSRect rect =
+      NSMakeRect(0, 0, kZoomInOutButtonWidth, kZoomBubbleWindowHeight);
   [zoomOutButton setFrame:rect];
 
   // Zoom label.

chrome/browser/ui/cocoa/bubble_sync_promo_controller.mm

@@ -19,18 +19,18 @@
 
 namespace {
 
-const SkColor kTextColor = SkColorSetRGB(0x66, 0x66, 0x66);
+const SkColor kPromoTextColor = SkColorSetRGB(0x66, 0x66, 0x66);
 const SkColor kPromoViewBackgroundColor = SkColorSetRGB(0xf5, 0xf5, 0xf5);
-const SkColor kBorderColor = SkColorSetRGB(0xe5, 0xe5, 0xe5);
+const SkColor kPromoBorderColor = SkColorSetRGB(0xe5, 0xe5, 0xe5);
 
 // Vertical padding of the promo (dp).
-const CGFloat kVerticalPadding = 15;
+const CGFloat kPromoVerticalPadding = 15;
 
 // Width of the border (dp).
-const CGFloat kBorderWidth = 1.0;
+const CGFloat kPromoBorderWidth = 1.0;
 
 // Font size of the promo text (pt).
-const int kFontSize = 11;
+const int kPromoFontSize = 11;
 
 }  // namespace
 
@@ -50,16 +50,17 @@ const int kFontSize = 11;
 }
 
 - (CGFloat)borderWidth {
-  return kBorderWidth;
+  return kPromoBorderWidth;
 }
 
 - (CGFloat)preferredHeightForWidth:(CGFloat)width {
   CGFloat availableWidth =
-      width - (2 * chrome_style::kHorizontalPadding) - (2 * kBorderWidth);
+      width - (2 * chrome_style::kHorizontalPadding) - (2 * kPromoBorderWidth);
   NSRect frame = [[textView_ textStorage]
       boundingRectWithSize:NSMakeSize(availableWidth, 0.0)
                    options:NSStringDrawingUsesLineFragmentOrigin];
-  return frame.size.height + (2 * kVerticalPadding) + (2 * kBorderWidth);
+  return frame.size.height + (2 * kPromoVerticalPadding) +
+         (2 * kPromoBorderWidth);
 }
 
 - (void)loadView {
@@ -68,10 +69,10 @@ const int kFontSize = 11;
   [promoView
       setFillColor:skia::SkColorToDeviceNSColor(kPromoViewBackgroundColor)];
   [promoView setContentViewMargins:NSMakeSize(chrome_style::kHorizontalPadding,
-                                              kVerticalPadding)];
+                                              kPromoVerticalPadding)];
   [promoView setBorderType:NSLineBorder];
-  [promoView setBorderWidth:kBorderWidth];
-  [promoView setBorderColor:skia::SkColorToDeviceNSColor(kBorderColor)];
+  [promoView setBorderWidth:kPromoBorderWidth];
+  [promoView setBorderColor:skia::SkColorToDeviceNSColor(kPromoBorderColor)];
 
   // Add the sync promo text.
   size_t offset;
@@ -80,14 +81,14 @@ const int kFontSize = 11;
       l10n_util::GetStringFUTF16(promoStringId_, linkText, &offset);
   NSString* nsPromoText = base::SysUTF16ToNSString(promoText);
   NSString* nsLinkText = base::SysUTF16ToNSString(linkText);
-  NSFont* font = [NSFont labelFontOfSize:kFontSize];
+  NSFont* font = [NSFont labelFontOfSize:kPromoFontSize];
   NSColor* linkColor = skia::SkColorToCalibratedNSColor(
       chrome_style::GetLinkColor());
 
   textView_.reset([[HyperlinkTextView alloc] init]);
   [textView_ setMessage:nsPromoText
                withFont:font
-           messageColor:skia::SkColorToDeviceNSColor(kTextColor)];
+           messageColor:skia::SkColorToDeviceNSColor(kPromoTextColor)];
   [textView_ addLinkRange:NSMakeRange(offset, [nsLinkText length])
                   withURL:nil
                 linkColor:linkColor];

chrome/browser/ui/cocoa/constrained_window/constrained_window_alert.mm

@@ -17,8 +17,8 @@
 
 namespace {
 
-const CGFloat kWindowMinWidth = 500;
-const CGFloat kButtonGap = 6;
+const CGFloat kConstrainedWindowMinWidth = 500;
+const CGFloat kConstrainedWindowButtonGap = 6;
 
 }  // namespace
 
@@ -163,21 +163,22 @@ const CGFloat kButtonGap = 6;
     buttonWidth += size.width;
   }
   if ([buttons_ count])
-    buttonWidth += ([buttons_ count] - 1) * kButtonGap;
+    buttonWidth += ([buttons_ count] - 1) * kConstrainedWindowButtonGap;
 
   // Window width.
   CGFloat windowWidth = buttonWidth;
   if (accessoryView_.get())
     windowWidth = std::max(windowWidth, NSWidth([accessoryView_ frame]));
   windowWidth += chrome_style::kHorizontalPadding * 2;
-  windowWidth = std::max(windowWidth, kWindowMinWidth);
+  windowWidth = std::max(windowWidth, kConstrainedWindowMinWidth);
 
   // Layout controls.
   [self layoutButtonsWithWindowWidth:windowWidth];
   CGFloat curY = [buttons_ count] ? NSMaxY([[buttons_ lastObject] frame])
       : chrome_style::kClientBottomPadding;
-  CGFloat availableMessageWidth =
-      windowWidth - chrome_style::GetCloseButtonSize() - kButtonGap;
+  CGFloat availableMessageWidth = windowWidth -
+                                  chrome_style::GetCloseButtonSize() -
+                                  kConstrainedWindowButtonGap;
   curY = [self layoutLinkAtYPos:curY
                     windowWidth:availableMessageWidth];
   curY = [self layoutAccessoryViewAtYPos:curY];
@@ -208,7 +209,7 @@ const CGFloat kButtonGap = 6;
     rect.origin.x = curX - NSWidth(rect);
     rect.origin.y = chrome_style::kClientBottomPadding;
     [button setFrameOrigin:rect.origin];
-    curX = NSMinX(rect) - kButtonGap;
+    curX = NSMinX(rect) - kConstrainedWindowButtonGap;
   }
 
   // Layout remaining buttons left to right.
@@ -217,7 +218,7 @@ const CGFloat kButtonGap = 6;
     NSButton* button = [buttons_ objectAtIndex:i];
     [button setFrameOrigin:
         NSMakePoint(curX, chrome_style::kClientBottomPadding)];
-    curX += NSMaxX([button frame]) + kButtonGap;
+    curX += NSMaxX([button frame]) + kConstrainedWindowButtonGap;
   }
 }
 

chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sheet.mm

@@ -14,7 +14,7 @@
 namespace {
 
 // Length of the animation in seconds.
-const NSTimeInterval kAnimationDuration = 0.18;
+const NSTimeInterval kSheetAnimationDuration = 0.18;
 
 // If the machine has a DisplayLink device attached, the WindowServer has a
 // tendency to crash https://crbug.com/755516. To avoid this, probe the
@@ -68,7 +68,7 @@ bool HasDisplayLinkDevice() {
 
   if (useSimpleAnimations_) {
     [NSAnimationContext beginGrouping];
-    [[NSAnimationContext currentContext] setDuration:kAnimationDuration];
+    [[NSAnimationContext currentContext] setDuration:kSheetAnimationDuration];
     [[customWindow_ animator] setAlphaValue:1.0];
     [NSAnimationContext endGrouping];
   } else {
@@ -87,7 +87,7 @@ bool HasDisplayLinkDevice() {
       } ];
       animation.reset(
           [[NSViewAnimation alloc] initWithViewAnimations:animationArray]);
-      [animation setDuration:kAnimationDuration];
+      [animation setDuration:kSheetAnimationDuration];
       [animation setAnimationBlockingMode:NSAnimationBlocking];
     } else {
       animation.reset([[ConstrainedWindowAnimationHide alloc]

chrome/browser/ui/cocoa/download/download_show_all_cell.mm

@@ -11,32 +11,33 @@
 #include "chrome/grit/theme_resources.h"
 
 // Distance from top border to icon.
-const CGFloat kImagePaddingTop = 7;
+const CGFloat kDownloadShowAllImagePaddingTop = 7;
 
 // Distance from left border to icon.
-const CGFloat kImagePaddingLeft = 11;
+const CGFloat kDownloadShowAllImagePaddingLeft = 11;
 
 // Width of icon.
-const CGFloat kImageWidth = 16;
+const CGFloat kDownloadShowAllImageWidth = 16;
 
 // Height of icon.
-const CGFloat kImageHeight = 16;
+const CGFloat kDownloadShowAllImageHeight = 16;
 
 // x distance between image and title.
-const CGFloat kImageTextPadding = 4;
+const CGFloat kDownloadShowAllImageTextPadding = 4;
 
 // x coordinate of download name string, in view coords.
-const CGFloat kTextPosLeft =
-    kImagePaddingLeft + kImageWidth + kImageTextPadding;
+const CGFloat kDownloadShowAllTextPosLeft = kDownloadShowAllImagePaddingLeft +
+                                            kDownloadShowAllImageWidth +
+                                            kDownloadShowAllImageTextPadding;
 
 // Distance from end of title to right border.
-const CGFloat kTextPaddingRight = 13;
+const CGFloat kDownloadShowAllTextPaddingRight = 13;
 
 // y coordinate of title, in view coords.
-const CGFloat kTextPosTop = 10;
+const CGFloat kDownloadShowAllTextPosTop = 10;
 
 // Width of outer stroke
-const CGFloat kOuterStrokeWidth = 1;
+const CGFloat kDownloadShowAllOuterStrokeWidth = 1;
 
 @interface DownloadShowAllCell(Private)
 - (const ui::ThemeProvider*)backgroundThemeWrappingProvider:
@@ -156,8 +157,9 @@ const CGFloat kOuterStrokeWidth = 1;
 
 - (void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView*)controlView {
   // Draw title
-  NSPoint primaryPos = NSMakePoint(
-      cellFrame.origin.x + kTextPosLeft, kTextPosTop);
+  NSPoint primaryPos =
+      NSMakePoint(cellFrame.origin.x + kDownloadShowAllTextPosLeft,
+                  kDownloadShowAllTextPosTop);
   [[self title] drawAtPoint:primaryPos withAttributes:[self textAttributes]];
 
   // Draw icon
@@ -170,10 +172,9 @@ const CGFloat kOuterStrokeWidth = 1;
 }
 
 - (NSRect)imageRectForBounds:(NSRect)cellFrame {
-  return NSMakeRect(cellFrame.origin.x + kImagePaddingLeft,
-                    cellFrame.origin.y + kImagePaddingTop,
-                    kImageWidth,
-                    kImageHeight);
+  return NSMakeRect(cellFrame.origin.x + kDownloadShowAllImagePaddingLeft,
+                    cellFrame.origin.y + kDownloadShowAllImagePaddingTop,
+                    kDownloadShowAllImageWidth, kDownloadShowAllImageHeight);
 }
 
 - (NSSize)cellSize {
@@ -181,8 +182,9 @@ const CGFloat kOuterStrokeWidth = 1;
 
   // Custom width:
   NSSize textSize = [[self title] sizeWithAttributes:[self textAttributes]];
-  size.width = kTextPosLeft + textSize.width + kTextPaddingRight +
-      kOuterStrokeWidth * 2;
+  size.width = kDownloadShowAllTextPosLeft + textSize.width +
+               kDownloadShowAllTextPaddingRight +
+               kDownloadShowAllOuterStrokeWidth * 2;
   return size;
 }
 @end

chrome/browser/ui/cocoa/extensions/browser_action_button.mm

@@ -38,11 +38,11 @@ NSString* const kBrowserActionButtonDraggingNotification =
 NSString* const kBrowserActionButtonDragEndNotification =
     @"BrowserActionButtonDragEndNotification";
 
-static const CGFloat kAnimationDuration = 0.2;
-static const CGFloat kMinimumDragDistance = 5;
+static const CGFloat kBrowserActionButtonAnimationDuration = 0.2;
+static const CGFloat kBrowserActionButtonMinimumDragDistance = 5;
 
 // Mirrors ui/views/mouse_constants.h for suppressing popup activation.
-static const int kMinimumMsBetweenCloseOpenPopup = 100;
+static const int kBrowserActionButtonMinimumMsBetweenCloseOpenPopup = 100;
 
 @interface BrowserActionButton ()
 - (void)endDrag;
@@ -69,7 +69,8 @@ class ToolbarActionViewDelegateBridge : public ToolbarActionViewDelegate {
     // If the user clicks on the browser action button to close the bubble,
     // don't show the next popup too soon on the mouse button up.
     base::TimeDelta delta = base::TimeTicks::Now() - popup_closed_time_;
-    return delta.InMilliseconds() >= kMinimumMsBetweenCloseOpenPopup;
+    return delta.InMilliseconds() >=
+           kBrowserActionButtonMinimumMsBetweenCloseOpenPopup;
   }
 
  private:
@@ -234,7 +235,7 @@ void ToolbarActionViewDelegateBridge::DoShowContextMenu() {
     [self setShowsBorderOnlyWhileMouseInside:YES];
 
     moveAnimation_.reset([[NSViewAnimation alloc] init]);
-    [moveAnimation_ gtm_setDuration:kAnimationDuration
+    [moveAnimation_ gtm_setDuration:kBrowserActionButtonAnimationDuration
                           eventMask:NSLeftMouseUpMask];
     [moveAnimation_ setAnimationBlockingMode:NSAnimationNonblocking];
 
@@ -294,11 +295,13 @@ void ToolbarActionViewDelegateBridge::DoShowContextMenu() {
 
   NSPoint eventPoint = [theEvent locationInWindow];
   if (!isBeingDragged_) {
-    // Don't initiate a drag until it moves at least kMinimumDragDistance.
+    // Don't initiate a drag until it moves at least
+    // kBrowserActionButtonMinimumDragDistance.
     NSPoint dragStart = [self convertPoint:dragStartPoint_ toView:nil];
     CGFloat dx = eventPoint.x - dragStart.x;
     CGFloat dy = eventPoint.y - dragStart.y;
-    if (dx*dx + dy*dy < kMinimumDragDistance*kMinimumDragDistance)
+    if (dx * dx + dy * dy < kBrowserActionButtonMinimumDragDistance *
+                                kBrowserActionButtonMinimumDragDistance)
       return;
 
     // The start of a drag. Position the button above all others.

chrome/browser/ui/cocoa/location_bar/location_bar_decoration.mm

@@ -32,7 +32,7 @@ const SkColor kPressedBackgroundColor = 0x1E000000;
 const SkColor kPressedDarkBackgroundColor = 0x3DFFFFFF;
 
 // Amount of inset for the background frame.
-const CGFloat kBackgroundFrameYInset = 2.0;
+const CGFloat kDecorationBackgroundFrameYInset = 2.0;
 
 }  // namespace
 
@@ -186,7 +186,7 @@ CGFloat LocationBarDecoration::GetWidthForSpace(CGFloat width) {
 }
 
 NSRect LocationBarDecoration::GetBackgroundFrame(NSRect frame) {
-  return NSInsetRect(frame, 0.0, kBackgroundFrameYInset);
+  return NSInsetRect(frame, 0.0, kDecorationBackgroundFrameYInset);
 }
 
 void LocationBarDecoration::UpdateAccessibilityView(NSRect apparent_frame) {

chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm

@@ -94,7 +94,7 @@ const CGFloat kLastPinnedTabSpacing = 2.0;
 // The amount by which the new tab button is offset (from the tabs).
 const CGFloat kNewTabButtonOffset = 10.0;
 
-const NSTimeInterval kAnimationDuration = 0.125;
+const NSTimeInterval kTabAnimationDuration = 0.125;
 
 // Helper class for doing NSAnimationContext calls that takes a bool to disable
 // all the work.  Useful for code that wants to conditionally animate.
@@ -412,7 +412,7 @@ NSRect FlipRectInView(NSView* view, NSRect rect) {
 @synthesize trailingIndentForControls = trailingIndentForControls_;
 
 + (CGFloat)tabAnimationDuration {
-  return kAnimationDuration;
+  return kTabAnimationDuration;
 }
 
 - (id)initWithView:(TabStripView*)view
@@ -948,7 +948,7 @@ contextMenuModelForController:(TabControllerCocoa*)controller
 
   NSRect enclosingRect = NSZeroRect;
   ScopedNSAnimationContextGroup mainAnimationGroup(animate);
-  mainAnimationGroup.SetCurrentContextDuration(kAnimationDuration);
+  mainAnimationGroup.SetCurrentContextDuration(kTabAnimationDuration);
 
   // Update the current subviews and their z-order if requested.
   if (doUpdate)
@@ -1168,7 +1168,7 @@ contextMenuModelForController:(TabControllerCocoa*)controller
       // display the wrong content when using a theme that creates transparent
       // tabs.
       ScopedNSAnimationContextGroup subAnimationGroup(animate);
-      subAnimationGroup.SetCurrentContextDuration(kAnimationDuration);
+      subAnimationGroup.SetCurrentContextDuration(kTabAnimationDuration);
       NSView* tabView = [tab view];
       [[NSAnimationContext currentContext] setCompletionHandler:^{
         [tabView setNeedsDisplay:YES];
@@ -1513,7 +1513,7 @@ contextMenuModelForController:(TabControllerCocoa*)controller
   NSRect newFrame = [tabView frame];
   newFrame = NSOffsetRect(newFrame, 0, -newFrame.size.height);
   ScopedNSAnimationContextGroup animationGroup(true);
-  animationGroup.SetCurrentContextDuration(kAnimationDuration);
+  animationGroup.SetCurrentContextDuration(kTabAnimationDuration);
   [[tabView animator] setFrame:newFrame];
 }
 

chrome/browser/ui/cocoa/tabs/tab_view.mm

@@ -88,7 +88,8 @@ const CGFloat kRapidCloseDist = 2.5;
 + (void)setTabEdgeStrokeColor;
 @end
 
-extern NSString* const _Nonnull NSWorkspaceAccessibilityDisplayOptionsDidChangeNotification;
+extern NSString* const
+    NSWorkspaceAccessibilityDisplayOptionsDidChangeNotification;
 
 namespace {