UI adjustments for the HIDE button in the screen share notification window.

chrome/browser/ui/cocoa/screen_capture_notification_ui_cocoa.mm

 // Copyright 2013 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 "chrome/browser/ui/cocoa/screen_capture_notification_ui_cocoa.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/compiler_specific.h"
 #include "base/i18n/rtl.h"
@@ skipping 11 matching lines @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_util_mac.h"
 #include "ui/gfx/text_elider.h"
 #include "ui/native_theme/native_theme.h"
 
 const CGFloat kMinimumWidth = 460;
 const CGFloat kMaximumWidth = 1000;
 const CGFloat kHorizontalMargin = 10;
-const CGFloat kPadding = 5;
-const CGFloat kPaddingLeft = 10;
+const CGFloat kPaddingVertical = 5;
+const CGFloat kPaddingHorizontal = 10;
 const CGFloat kWindowCornerRadius = 2;
 const CGFloat kWindowAlphaValue = 0.85;
 
 @interface ScreenCaptureNotificationController()
 - (void)hide;
 - (void)populateWithText:(const base::string16&)text;
 @end
 
 @interface ScreenCaptureNotificationView : NSView
 @end
@@ skipping 89 matching lines @@
 
   // Create button.
   stopButton_.reset([[BlueLabelButton alloc] initWithFrame:NSZeroRect]);
   [stopButton_ setTitle:l10n_util::GetNSString(
                   IDS_MEDIA_SCREEN_CAPTURE_NOTIFICATION_STOP)];
   [stopButton_ setTarget:self];
   [stopButton_ setAction:@selector(stopSharing:)];
   [stopButton_ sizeToFit];
   [content addSubview:stopButton_];
 
-  minimizeButton_.reset(
-      [[HyperlinkButtonCell buttonWithString:l10n_util::GetNSString(
-          IDS_PASSWORDS_PAGE_VIEW_HIDE_BUTTON)] retain]);
+  base::scoped_nsobject<HyperlinkButtonCell> cell(
+      [[HyperlinkButtonCell alloc]
+       initTextCell:l10n_util::GetNSString(
+                        IDS_PASSWORDS_PAGE_VIEW_HIDE_BUTTON)]);
+  [cell setShouldUnderline:NO];
+
+  minimizeButton_.reset([[NSButton alloc] initWithFrame:NSZeroRect]);
+  [minimizeButton_ setCell:cell.get()];
   [minimizeButton_ sizeToFit];
   [minimizeButton_ setTarget:self];
   [minimizeButton_ setAction:@selector(minimize:)];
   [content addSubview:minimizeButton_];
 
   CGFloat buttonsWidth = NSWidth([stopButton_ frame]) + kHorizontalMargin +
       NSWidth([minimizeButton_ frame]);
-  CGFloat totalHeight = kPadding + NSHeight([stopButton_ frame]) + kPadding;
+  CGFloat totalHeight =
+      kPaddingVertical + NSHeight([stopButton_ frame]) + kPaddingVertical;
 
   // Create grip icon.
   base::scoped_nsobject<WindowGripView> gripView([[WindowGripView alloc] init]);
   [content addSubview:gripView];
   CGFloat gripWidth = NSWidth([gripView frame]);
   CGFloat gripHeight = NSHeight([gripView frame]);
-  [gripView
-      setFrameOrigin:NSMakePoint(kPaddingLeft, (totalHeight - gripHeight) / 2)];
+  [gripView setFrameOrigin:NSMakePoint(kPaddingHorizontal,
+                                       (totalHeight - gripHeight) / 2)];
 
   // Create text label.
   int maximumWidth =
       std::min(kMaximumWidth, NSWidth([[NSScreen mainScreen] visibleFrame]));
-  int maxLabelWidth = maximumWidth - kPaddingLeft - kPadding -
+  int maxLabelWidth = maximumWidth - kPaddingHorizontal * 2 -
                       kHorizontalMargin * 2 - gripWidth - buttonsWidth;
   gfx::FontList font_list;
   base::string16 elidedText =
       ElideText(text, font_list, maxLabelWidth, gfx::ELIDE_IN_MIDDLE);
   NSString* statusText = base::SysUTF16ToNSString(elidedText);
   base::scoped_nsobject<NSTextField> statusTextField(
       [[NSTextField alloc] initWithFrame:ui::kWindowSizeDeterminedLater]);
   [statusTextField setEditable:NO];
   [statusTextField setSelectable:NO];
   [statusTextField setDrawsBackground:NO];
   [statusTextField setBezeled:NO];
   [statusTextField setStringValue:statusText];
   [statusTextField setFont:font_list.GetPrimaryFont().GetNativeFont()];
   [statusTextField sizeToFit];
   [statusTextField setFrameOrigin:NSMakePoint(
-                       kPaddingLeft + kHorizontalMargin + gripWidth,
+                       kPaddingHorizontal + kHorizontalMargin + gripWidth,
                        (totalHeight - NSHeight([statusTextField frame])) / 2)];
   [content addSubview:statusTextField];
 
   // Resize content view to fit controls.
-  CGFloat minimumLableWidth = kMinimumWidth - kPaddingLeft - kPadding -
+  CGFloat minimumLableWidth = kMinimumWidth - kPaddingHorizontal * 2 -
                               kHorizontalMargin * 2 - gripWidth - buttonsWidth;
   CGFloat lableWidth =
       std::max(NSWidth([statusTextField frame]), minimumLableWidth);
-  CGFloat totalWidth = kPaddingLeft + kPadding + kHorizontalMargin * 2 +
+  CGFloat totalWidth = kPaddingHorizontal * 2 + kHorizontalMargin * 2 +
                        gripWidth + lableWidth + buttonsWidth;
   [content setFrame:NSMakeRect(0, 0, totalWidth, totalHeight)];
 
   // Move the buttons to the right place.
-  NSPoint buttonOrigin =
-      NSMakePoint(totalWidth - kPadding - buttonsWidth, kPadding);
+  NSPoint buttonOrigin = NSMakePoint(
+      totalWidth - kPaddingHorizontal - buttonsWidth, kPaddingVertical);
   [stopButton_ setFrameOrigin:buttonOrigin];
 
   [minimizeButton_ setFrameOrigin:NSMakePoint(
-      totalWidth - kPadding - NSWidth([minimizeButton_ frame]),
+      totalWidth - kPaddingHorizontal - NSWidth([minimizeButton_ frame]),
       (totalHeight - NSHeight([minimizeButton_ frame])) / 2)];
 
   if (base::i18n::IsRTL()) {
     [stopButton_
         setFrameOrigin:NSMakePoint(totalWidth - NSMaxX([stopButton_ frame]),
                                    NSMinY([stopButton_ frame]))];
     [minimizeButton_
         setFrameOrigin:NSMakePoint(totalWidth - NSMaxX([minimizeButton_ frame]),
                                    NSMinY([minimizeButton_ frame]))];
     [statusTextField
@@ skipping 31 matching lines @@
   self = [super
       initWithFrame:NSMakeRect(0, 0, gripImage.Width(), gripImage.Height())];
   [self setImage:gripImage.ToNSImage()];
   return self;
 }
 
 - (BOOL)mouseDownCanMoveWindow {
   return YES;
 }
 @end