Merge 256851 "Adds a hide button to the desktop capture notifica..."

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"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "ui/base/cocoa/controls/blue_label_button.h"
+#import "ui/base/cocoa/controls/hyperlink_button_cell.h"
 #include "ui/base/cocoa/window_size_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #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;
@@ skipping 76 matching lines @@
 }
 
 - (void)stopSharing:(id)sender {
   if (!stop_callback_.is_null()) {
     base::Closure callback = stop_callback_;
     stop_callback_.Reset();
     callback.Run();  // Deletes |self|.
   }
 }
 
+- (void)minimize:(id)sender {
+  [[self window] miniaturize:sender];
+}
+
 - (void)hide {
   stop_callback_.Reset();
   [self close];
 }
 
 - (void)populateWithText:(const base::string16&)text {
   base::scoped_nsobject<ScreenCaptureNotificationView> content(
       [[ScreenCaptureNotificationView alloc]
           initWithFrame:ui::kWindowSizeDeterminedLater]);
   [[self window] setContentView:content];
 
   // 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_];
 
-  CGFloat buttonWidth = NSWidth([stopButton_ frame]);
+  minimizeButton_.reset(
+      [[HyperlinkButtonCell buttonWithString:l10n_util::GetNSString(
+          IDS_PASSWORDS_PAGE_VIEW_HIDE_BUTTON)] retain]);
+  [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;
 
   // 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)];
 
   // Create text label.
   int maximumWidth =
       std::min(kMaximumWidth, NSWidth([[NSScreen mainScreen] visibleFrame]));
   int maxLabelWidth = maximumWidth - kPaddingLeft - kPadding -
-                      kHorizontalMargin * 2 - gripWidth - buttonWidth;
+                      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,
                        (totalHeight - NSHeight([statusTextField frame])) / 2)];
   [content addSubview:statusTextField];
 
   // Resize content view to fit controls.
   CGFloat minimumLableWidth = kMinimumWidth - kPaddingLeft - kPadding -
-                              kHorizontalMargin * 2 - gripWidth - buttonWidth;
+                              kHorizontalMargin * 2 - gripWidth - buttonsWidth;
   CGFloat lableWidth =
       std::max(NSWidth([statusTextField frame]), minimumLableWidth);
   CGFloat totalWidth = kPaddingLeft + kPadding + kHorizontalMargin * 2 +
-                       gripWidth + lableWidth + buttonWidth;
+                       gripWidth + lableWidth + buttonsWidth;
   [content setFrame:NSMakeRect(0, 0, totalWidth, totalHeight)];
 
-  // Move the button to the right place.
+  // Move the buttons to the right place.
   NSPoint buttonOrigin =
-      NSMakePoint(totalWidth - kPadding - buttonWidth, kPadding);
+      NSMakePoint(totalWidth - kPadding - buttonsWidth, kPadding);
   [stopButton_ setFrameOrigin:buttonOrigin];
 
+  [minimizeButton_ setFrameOrigin:NSMakePoint(
+      totalWidth - kPadding - 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
         setFrameOrigin:NSMakePoint(totalWidth - NSMaxX([statusTextField frame]),
                                    NSMinY([statusTextField frame]))];
     [gripView setFrameOrigin:NSMakePoint(totalWidth - NSMaxX([gripView frame]),
                                          NSMinY([gripView frame]))];
   }
 }
 
 - (void)windowWillClose:(NSNotification*)notification {
   [self stopSharing:nil];
@@ skipping 22 matching lines @@
   self = [super
       initWithFrame:NSMakeRect(0, 0, gripImage.Width(), gripImage.Height())];
   [self setImage:gripImage.ToNSImage()];
   return self;
 }
 
 - (BOOL)mouseDownCanMoveWindow {
   return YES;
 }
 @end