Show progress bar notifications for Mac.

Show progress bar notifications for Mac.

BUG=170924
TEST=manual test by creating a progress bar notification
R=dewittj@chromium.org, rsesek@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=214276

[Robert Sesek, 2013-07-29 18:50:26]

Can you post a link to a screen shot?

https://codereview.chromium.org/21118002/diff/1/ui/message_center/cocoa/notif...
File ui/message_center/cocoa/notification_controller.mm (right):

https://codereview.chromium.org/21118002/diff/1/ui/message_center/cocoa/notif...
ui/message_center/cocoa/notification_controller.mm:24: const SkColor
kProgressBarBackgroundColor = SkColorSetRGB(230, 230, 230);
Should these be shared in the constants file?

https://codereview.chromium.org/21118002/diff/1/ui/message_center/cocoa/notif...
ui/message_center/cocoa/notification_controller.mm:29: @interface
MCNotificationProgressBar : NSProgressIndicator {
nit: remove {}

https://codereview.chromium.org/21118002/diff/1/ui/message_center/cocoa/notif...
ui/message_center/cocoa/notification_controller.mm:365:
initWithFrame:progressBarFrame]);
nit: does this fit if you break after the .reset( and put the entire ObjC call
on its own line?

[jianli, 2013-07-29 19:05:40]

https://codereview.chromium.org/21118002/diff/1/ui/message_center/cocoa/notif...
File ui/message_center/cocoa/notification_controller.mm (right):

https://codereview.chromium.org/21118002/diff/1/ui/message_center/cocoa/notif...
ui/message_center/cocoa/notification_controller.mm:24: const SkColor
kProgressBarBackgroundColor = SkColorSetRGB(230, 230, 230);
On 2013/07/29 18:50:26, rsesek wrote:
> Should these be shared in the constants file?

The constants used to paint progress bar for Windows is defined in
ui/views/controls/progress_bar.cc that is used in quite a few other places other
than progress bar notifications. So we can't pull these constants out into a
common file since they're only used for Cocoa implementation.

https://codereview.chromium.org/21118002/diff/1/ui/message_center/cocoa/notif...
ui/message_center/cocoa/notification_controller.mm:29: @interface
MCNotificationProgressBar : NSProgressIndicator {
On 2013/07/29 18:50:26, rsesek wrote:
> nit: remove {}

Done.

https://codereview.chromium.org/21118002/diff/1/ui/message_center/cocoa/notif...
ui/message_center/cocoa/notification_controller.mm:365:
initWithFrame:progressBarFrame]);
On 2013/07/29 18:50:26, rsesek wrote:
> nit: does this fit if you break after the .reset( and put the entire ObjC call
> on its own line?

Done.

[Robert Sesek, 2013-07-29 19:06:25]

lgtm

[commit-bot: I haz the power, 2013-07-29 20:10:56]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/jianli@chromium.org/21118002/22001

[dewittj, 2013-07-30 00:29:40]

rubber stamp lgtm

[jianli, 2013-07-30 00:32:55]

Committed patchset #2 manually as r214276 (presubmit successful).

[commit-bot: I haz the power, 2013-07-30 05:46:12]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/jianli@chromium.org/21118002/22001

[commit-bot: I haz the power, 2013-07-30 05:46:21]

Failed to apply patch for ui/message_center/cocoa/notification_controller.mm:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file ui/message_center/cocoa/notification_controller.mm
  Hunk #1 succeeded at 53 with fuzz 2 (offset 34 lines).
  Hunk #2 FAILED at 352.
  Hunk #3 FAILED at 432.
  2 out of 3 hunks FAILED -- saving rejects to file
ui/message_center/cocoa/notification_controller.mm.rej

Patch:       ui/message_center/cocoa/notification_controller.mm
Index: ui/message_center/cocoa/notification_controller.mm
diff --git a/ui/message_center/cocoa/notification_controller.mm
b/ui/message_center/cocoa/notification_controller.mm
index
afea9e6ca4e6a57b0a240c842f641c8e29010f90..175ed52497f68cbef4553573be2ac8b4b7a45561
100644
--- a/ui/message_center/cocoa/notification_controller.mm
+++ b/ui/message_center/cocoa/notification_controller.mm
@@ -19,6 +19,40 @@
 #include "ui/message_center/message_center_style.h"
 #include "ui/message_center/notification.h"
 
+const CGFloat kProgressBarThickness = 8;
+const CGFloat kProgressBarTopPadding = 12;
+const SkColor kProgressBarBackgroundColor = SkColorSetRGB(230, 230, 230);
+const SkColor kProgressBarBackgroundBorderColor = SkColorSetRGB(208, 208, 208);
+const SkColor kProgressBarSliceColor = SkColorSetRGB(78, 156, 245);
+const SkColor kProgressBarSliceBorderColor = SkColorSetRGB(110, 188, 249);
+
+@interface MCNotificationProgressBar : NSProgressIndicator
+@end
+
+@implementation MCNotificationProgressBar
+- (void)drawRect:(NSRect)dirtyRect {
+  NSRect sliceRect, remainderRect;
+  double progressFraction = ([self doubleValue] - [self minValue]) /
+      ([self maxValue] - [self minValue]);
+  NSDivideRect(dirtyRect, &sliceRect, &remainderRect,
+               NSWidth(dirtyRect) * progressFraction, NSMinXEdge);
+
+  // For slice part.
+  [gfx::SkColorToCalibratedNSColor(kProgressBarSliceBorderColor)
+      drawSwatchInRect:sliceRect];
+  [gfx::SkColorToCalibratedNSColor(kProgressBarSliceColor)
+      drawSwatchInRect:NSInsetRect(sliceRect, 1.0, 1.0)];
+
+  // For remainder part.
+  [gfx::SkColorToCalibratedNSColor(kProgressBarBackgroundBorderColor)
+      drawSwatchInRect:remainderRect];
+  [gfx::SkColorToCalibratedNSColor(kProgressBarBackgroundColor)
+      drawSwatchInRect:NSInsetRect(remainderRect, 1.0, 1.0)];
+}
+@end
+
+////////////////////////////////////////////////////////////////////////////////
+
 @interface MCNotificationButtonCell : NSButtonCell {
   BOOL hovered_;
 }
@@ -318,17 +352,37 @@
     [[self view] addSubview:listItemView_];
   }
 
+  // Create the progress bar view if needed.
+  [progressBarView_ removeFromSuperview];
+  NSRect progressBarFrame = NSZeroRect;
+  if (notification->type() == message_center::NOTIFICATION_TYPE_PROGRESS) {
+    progressBarFrame = [self currentContentRect];
+    progressBarFrame.origin.y = NSMinY(messageFrame) -
+        kProgressBarTopPadding - kProgressBarThickness;
+    progressBarFrame.size.height = kProgressBarThickness;
+    progressBarView_.reset(
+        [[MCNotificationProgressBar alloc] initWithFrame:progressBarFrame]);
+    // Setting indeterminate to NO does not work with custom drawRect.
+    [progressBarView_ setIndeterminate:YES];
+    [progressBarView_ setStyle:NSProgressIndicatorBarStyle];
+    [progressBarView_ setDoubleValue:notification->progress()];
+    [[self view] addSubview:progressBarView_];
+  }
+
   // If the bottom-most element so far is out of the rootView's bounds, resize
   // the view.
   CGFloat minY = NSMinY(messageFrame);
   if (listItemView_ && NSMinY(listFrame) < minY)
     minY = NSMinY(listFrame);
+  if (progressBarView_ && NSMinY(progressBarFrame) < minY)
+    minY = NSMinY(progressBarFrame);
   if (minY < messagePadding) {
     CGFloat delta = messagePadding - minY;
     rootFrame.size.height += delta;
     titleFrame.origin.y += delta;
     messageFrame.origin.y += delta;
     listFrame.origin.y += delta;
+    progressBarFrame.origin.y += delta;
   }
 
   // Add the bottom container view.
@@ -398,11 +452,13 @@
   titleFrame.origin.y += NSHeight(frame);
   messageFrame.origin.y += NSHeight(frame);
   listFrame.origin.y += NSHeight(frame);
+  progressBarFrame.origin.y += NSHeight(frame);
 
   [[self view] setFrame:rootFrame];
   [title_ setFrame:titleFrame];
   [message_ setFrame:messageFrame];
   [listItemView_ setFrame:listFrame];
+  [progressBarView_ setFrame:progressBarFrame];
 
   return rootFrame;
 }