Update progress bar notification UI on Windows per latest UI decision.

ui/message_center/views/notification_view.cc

 // Copyright (c) 2012 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 "ui/message_center/views/notification_view.h"
 
 #include "base/command_line.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/text/text_elider.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/size.h"
+#include "ui/gfx/skia_util.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/message_center_style.h"
 #include "ui/message_center/message_center_switches.h"
 #include "ui/message_center/message_center_util.h"
 #include "ui/message_center/notification.h"
 #include "ui/message_center/notification_types.h"
 #include "ui/message_center/views/bounded_label.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/progress_bar.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
 // Dimensions.
 const int kIconSize = message_center::kNotificationIconSize;
 const int kLegacyIconSize = 40;
 const int kIconBottomPadding = 16;
 const int kTextLeftPadding = kIconSize + message_center::kIconToTextPadding;
 const int kTextBottomPadding = 12;
 const int kTextRightPadding = 23;
 const int kItemTitleToMessagePadding = 3;
 const int kProgressBarWidth = message_center::kNotificationWidth -
     kTextLeftPadding - kTextRightPadding;
-const int kProgressBarHeight = 8;
-const int kProgressBarTopPadding = 12;
-const int kProgressBarBottomPadding = 2;
+const int kProgressBarBottomPadding = 0;
 const int kButtonVecticalPadding = 0;
 const int kButtonTitleTopPadding = 0;
 
 // Character limits: Displayed text will be subject to the line limits above,
 // but we also remove trailing characters from text to reduce processing cost.
 // Character limit = pixels per line * line limit / min. pixels per character.
 const size_t kTitleCharacterLimit =
     message_center::kNotificationWidth * message_center::kTitleLineLimit / 4;
 const size_t kMessageCharacterLimit =
     message_center::kNotificationWidth *
@@ skipping 180 matching lines @@
 // NotificationProgressBar /////////////////////////////////////////////////////
 
 class NotificationProgressBar : public views::ProgressBar {
  public:
   NotificationProgressBar();
   virtual ~NotificationProgressBar();
 
  private:
   // Overriden from View
   virtual gfx::Size GetPreferredSize() OVERRIDE;
+  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(NotificationProgressBar);
 };
 
 NotificationProgressBar::NotificationProgressBar() {
 }
 
 NotificationProgressBar::~NotificationProgressBar() {
 }
 
 gfx::Size NotificationProgressBar::GetPreferredSize() {
-  gfx::Size pref_size(kProgressBarWidth, kProgressBarHeight);
+  gfx::Size pref_size(kProgressBarWidth, message_center::kProgressBarThickness);
   gfx::Insets insets = GetInsets();
   pref_size.Enlarge(insets.width(), insets.height());
   return pref_size;
 }
 
+void NotificationProgressBar::OnPaint(gfx::Canvas* canvas) {
+  gfx::Rect content_bounds = GetContentsBounds();
+  int bar_left = content_bounds.x();
+  int bar_top = content_bounds.y();
+  int bar_width = content_bounds.width();
+  int bar_height = content_bounds.height();
+
+  // Draw background.
+  SkPath background_path;
+  background_path.addRoundRect(gfx::RectToSkRect(content_bounds),
+                               message_center::kProgressBarCornerRadius,
+                               message_center::kProgressBarCornerRadius);
+  SkPaint background_paint;
+  background_paint.setStyle(SkPaint::kFill_Style);
+  background_paint.setFlags(SkPaint::kAntiAlias_Flag);
+  background_paint.setColor(message_center::kProgressBarBackgroundColor);
+  canvas->DrawPath(background_path, background_paint);
+
+  // Draw slice.
+  const int slice_width =
+      static_cast<int>(bar_width * GetNormalizedValue() + 0.5);
+  if (slice_width < 1)
+    return;
+
+  gfx::Rect slice_bounds = content_bounds;
+  slice_bounds.set_width(slice_width);
+  SkPath slice_path;
+  slice_path.addRoundRect(gfx::RectToSkRect(slice_bounds),
+                          message_center::kProgressBarCornerRadius,
+                          message_center::kProgressBarCornerRadius);
+  SkPaint slice_paint;
+  slice_paint.setStyle(SkPaint::kFill_Style);
+  slice_paint.setFlags(SkPaint::kAntiAlias_Flag);
+  slice_paint.setColor(message_center::kProgressBarSliceColor);
+  canvas->DrawPath(slice_path, slice_paint);
+}
+
 // NotificationButton //////////////////////////////////////////////////////////
 
 // NotificationButtons render the action buttons of notifications.
 class NotificationButton : public views::CustomButton {
  public:
   NotificationButton(views::ButtonListener* listener);
   virtual ~NotificationButton();
 
   void SetIcon(const gfx::ImageSkia& icon);
   void SetTitle(const string16& title);
@@ skipping 185 matching lines @@
     message_view_->set_border(MakeTextBorder(padding, 4, 0));
     top_view_->AddChildView(message_view_);
     accessible_lines.push_back(notification.message());
   }
 
   // Create the progress bar view.
   progress_bar_view_ = NULL;
   if (notification.type() == NOTIFICATION_TYPE_PROGRESS) {
     progress_bar_view_ = new NotificationProgressBar();
     progress_bar_view_->set_border(MakeProgressBarBorder(
-        kProgressBarTopPadding, kProgressBarBottomPadding));
+        message_center::kProgressBarTopPadding, kProgressBarBottomPadding));

[dewittj, 2013/08/05 22:34:39]

Why move one to message_center and not the other?

[jianli, 2013/08/05 22:42:16]

We do not need extra bottom padding for progress bar since the bottom padding is
indeed provided by kTextBottomPadding at line 467.

     progress_bar_view_->SetValue(notification.progress() / 100.0);
     top_view_->AddChildView(progress_bar_view_);
   }
 
   // Create the list item views (up to a maximum).
   int padding = kMessageLineHeight - views::Label().font().GetHeight();
   std::vector<NotificationItem> items = notification.items();
   for (size_t i = 0; i < items.size() && i < kNotificationMaximumItems; ++i) {
     ItemView* item_view = new ItemView(items[i]);
     item_view->SetVisible(is_expanded());
@@ skipping 244 matching lines @@
   return message_view_ ?
          message_view_->GetLinesForWidthAndLimit(width, limit) : 0;
 }
 
 int NotificationView::GetMessageHeight(int width, int limit) {
   return message_view_ ?
          message_view_->GetSizeForWidthAndLines(width, limit).height() : 0;
 }
 
 }  // namespace message_center