Add percentage of progress in notification header.

ui/message_center/views/notification_header_view.cc

 // Copyright 2017 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_header_view.h"
 
+#include "base/strings/string_number_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/message_center/message_center_style.h"
 #include "ui/message_center/vector_icons.h"
 #include "ui/message_center/views/padded_button.h"
 #include "ui/strings/grit/ui_strings.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/layout/box_layout.h"
 #include "ui/views/painter.h"
 
 namespace message_center {
 
 namespace {
 
 constexpr int kHeaderHeight = 28;
 constexpr int kAppIconSize = 12;
 constexpr int kExpandIconSize = 12;
 constexpr gfx::Insets kHeaderPadding(0, 12, 0, 2);
 constexpr int kHeaderHorizontalSpacing = 2;
 constexpr int kAppInfoConatainerTopPadding = 12;
+constexpr base::char16 kNotificationHeaderDividerSymbol = 0x2022;

[yoshiki, 2017/06/27 07:15:18]

nit: could you explain about the character as a comment?

[tetsui, 2017/06/27 07:37:36]

Done.

 
 }  // namespace
 
 NotificationHeaderView::NotificationHeaderView(views::ButtonListener* listener)
     : views::CustomButton(listener) {
   views::BoxLayout* layout = new views::BoxLayout(
       views::BoxLayout::kHorizontal, kHeaderPadding, kHeaderHorizontalSpacing);
   layout->set_cross_axis_alignment(
       views::BoxLayout::CROSS_AXIS_ALIGNMENT_CENTER);
   SetLayoutManager(layout);
@@ skipping 14 matching lines @@
   app_info_container->AddChildView(app_icon_view_);
 
   // App name view
   const gfx::FontList& font_list = views::Label().font_list().Derive(
       -2, gfx::Font::NORMAL, gfx::Font::Weight::NORMAL);
   app_name_view_ = new views::Label(base::string16());
   app_name_view_->SetFontList(font_list);
   app_name_view_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   app_info_container->AddChildView(app_name_view_);
 
+  // Summary text divider
+  summary_text_divider_ =
+      new views::Label(base::ASCIIToUTF16(" ") +
+                       base::string16(1, kNotificationHeaderDividerSymbol) +
+                       base::ASCIIToUTF16(" "));
+  summary_text_divider_->SetFontList(font_list);
+  summary_text_divider_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+  summary_text_divider_->SetVisible(false);
+  app_info_container->AddChildView(summary_text_divider_);
+
+  // Summary text view
+  summary_text_view_ = new views::Label(base::string16());
+  summary_text_view_->SetFontList(font_list);
+  summary_text_view_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+  summary_text_view_->SetVisible(false);
+  app_info_container->AddChildView(summary_text_view_);
+
   // Expand button view
   expand_button_ = new views::ImageButton(listener);
   expand_button_->SetImage(
       views::Button::STATE_NORMAL,
       gfx::CreateVectorIcon(kNotificationExpandMoreIcon, kExpandIconSize,
                             gfx::kChromeIconGrey));
   expand_button_->SetFocusForPlatform();
   expand_button_->SetFocusPainter(views::Painter::CreateSolidFocusPainter(
       kFocusBorderColor, gfx::Insets(1, 2, 2, 2)));
   app_info_container->AddChildView(expand_button_);
@@ skipping 24 matching lines @@
 }
 
 void NotificationHeaderView::SetAppIcon(const gfx::ImageSkia& img) {
   app_icon_view_->SetImage(img);
 }
 
 void NotificationHeaderView::SetAppName(const base::string16& name) {
   app_name_view_->SetText(name);
 }
 
+void NotificationHeaderView::SetProgress(int progress) {
+  summary_text_view_->SetText(l10n_util::GetStringFUTF16Int(
+      IDS_MESSAGE_CENTER_NOTIFICATION_PROGRESS_PERCENTAGE, progress));
+  has_progress_ = true;

[yoshiki, 2017/06/27 07:15:18]

nit: has_summary_text_ might be better? it's up to you.

[tetsui, 2017/06/27 07:37:36]

Done.

+  UpdateSummaryTextVisibility();
+}
+
+void NotificationHeaderView::ClearProgress() {
+  has_progress_ = false;
+  UpdateSummaryTextVisibility();
+}
+
 void NotificationHeaderView::SetExpandButtonEnabled(bool enabled) {
   expand_button_->SetVisible(enabled);
 }
 
 void NotificationHeaderView::SetExpanded(bool expanded) {
   expand_button_->SetImage(
       views::Button::STATE_NORMAL,
       gfx::CreateVectorIcon(
           expanded ? kNotificationExpandLessIcon : kNotificationExpandMoreIcon,
           kExpandIconSize, gfx::kChromeIconGrey));
@@ skipping 33 matching lines @@
 }
 
 void NotificationHeaderView::UpdateControlButtonsVisibility() {
   settings_button_->SetVisible(settings_button_enabled_ &&
                                is_control_buttons_visible_);
   close_button_->SetVisible(close_button_enabled_ &&
                             is_control_buttons_visible_);
   Layout();
 }
 
+void NotificationHeaderView::UpdateSummaryTextVisibility() {
+  summary_text_divider_->SetVisible(has_progress_);
+  summary_text_view_->SetVisible(has_progress_);
+  Layout();
+}
+
 }  // namespace message_center