Unified: Change sub header separator color.

This CL changes sub header separator color of detailed views in
UnifiedSystemTray.

Screenshot: http://screen/t36mz755DuP

TEST=manual
BUG=854146

Change-Id: I77b37bc6e352f427453c5da635c9d6d9dd649f0f
Reviewed-on: https://chromium-review.googlesource.com/1107428Reviewed-by: Yoshiki Iguchi <yoshiki@chromium.org>
Commit-Queue: Tetsui Ohkubo <tetsui@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568753}

ash/system/audio/audio_detailed_view.cc

@@ -139,8 +139,7 @@ void AudioDetailedView::UpdateScrollableList() {
   }
 
   if (has_output_devices) {
-    scroll_content()->AddChildView(
-        TrayPopupUtils::CreateListSubHeaderSeparator());
+    scroll_content()->AddChildView(CreateListSubHeaderSeparator());
   }
 
   // Add audio input devices.

ash/system/ime_menu/ime_menu_tray.cc

@@ -271,6 +271,9 @@ class ImeMenuListView : public ImeListView, public DetailedViewDelegate {
   bool IsOverflowIndicatorEnabled() const override { return true; }
   TriView* CreateTitleRow(int string_id) override { return nullptr; }
   views::View* CreateTitleSeparator() override { return nullptr; }
+  void ShowStickyHeaderSeparator(views::View* view,
+                                 bool show_separator) override {}
+  views::Separator* CreateListSubHeaderSeparator() override { return nullptr; }
   HoverHighlightView* CreateScrollListItem(
       ViewClickListener* listener,
       const gfx::VectorIcon& icon,

ash/system/network/network_list.cc

@@ -925,7 +925,7 @@ int NetworkListView::UpdateSectionHeaderRow(NetworkTypePattern pattern,
   // visible when the header row is not at the top of the list.
   if (child_index > 0) {
     if (!*separator_view)
-      *separator_view = TrayPopupUtils::CreateListSubHeaderSeparator();
+      *separator_view = CreateListSubHeaderSeparator();
     PlaceViewAtIndex(*separator_view, child_index++);
   } else {
     if (*separator_view)

ash/system/network/vpn_list_view.cc

@@ -324,8 +324,7 @@ void VPNListView::AddProviderAndNetworks(
     const chromeos::NetworkStateHandler::NetworkStateList& networks) {
   // Add a visual separator, unless this is the topmost entry in the list.
   if (!list_empty_) {
-    scroll_content()->AddChildView(
-        TrayPopupUtils::CreateListSubHeaderSeparator());
+    scroll_content()->AddChildView(CreateListSubHeaderSeparator());
   }
   std::string vpn_name =
       vpn_provider.provider_type == VPNProvider::BUILT_IN_VPN

ash/system/tray/detailed_view_delegate.h

@@ -19,6 +19,7 @@ class NativeTheme;
 namespace views {
 class Button;
 class ButtonListener;
+class Separator;
 class View;
 }  // namespace views
 
@@ -57,6 +58,15 @@ class DetailedViewDelegate {
   // takes ownership of the returned view.
   virtual views::View* CreateTitleSeparator() = 0;
 
+  // Configure a |view| to have a visible separator below.
+  virtual void ShowStickyHeaderSeparator(views::View* view,
+                                         bool show_separator) = 0;
+
+  // Create a horizontal separator line to be drawn between rows in a detailed
+  // view above the sub-header rows. Caller takes ownership of the returned
+  // view.
+  virtual views::Separator* CreateListSubHeaderSeparator() = 0;
+
   // Return a targetable row containing |icon| and |text|. Caller takes
   // ownership of the returned view.
   virtual HoverHighlightView* CreateScrollListItem(

ash/system/tray/system_tray_item_detailed_view_delegate.cc

@@ -86,6 +86,17 @@ views::View* SystemTrayItemDetailedViewDelegate::CreateTitleSeparator() {
   return separator;
 }
 
+void SystemTrayItemDetailedViewDelegate::ShowStickyHeaderSeparator(
+    views::View* view,
+    bool show_separator) {
+  TrayPopupUtils::ShowStickyHeaderSeparator(view, show_separator);
+}
+
+views::Separator*
+SystemTrayItemDetailedViewDelegate::CreateListSubHeaderSeparator() {
+  return TrayPopupUtils::CreateListSubHeaderSeparator();
+}
+
 HoverHighlightView* SystemTrayItemDetailedViewDelegate::CreateScrollListItem(
     ViewClickListener* listener,
     const gfx::VectorIcon& icon,

ash/system/tray/system_tray_item_detailed_view_delegate.h

@@ -28,6 +28,9 @@ class ASH_EXPORT SystemTrayItemDetailedViewDelegate
   bool IsOverflowIndicatorEnabled() const override;
   TriView* CreateTitleRow(int string_id) override;
   views::View* CreateTitleSeparator() override;
+  void ShowStickyHeaderSeparator(views::View* view,
+                                 bool show_separator) override;
+  views::Separator* CreateListSubHeaderSeparator() override;
   HoverHighlightView* CreateScrollListItem(ViewClickListener* listener,
                                            const gfx::VectorIcon& icon,
                                            const base::string16& text) override;

ash/system/tray/tray_detailed_view.cc

@@ -54,7 +54,8 @@ const int kTitleRowSeparatorIndex = 1;
 // row use set_id(VIEW_ID_STICKY_HEADER).
 class ScrollContentsView : public views::View {
  public:
-  ScrollContentsView() {
+  explicit ScrollContentsView(DetailedViewDelegate* delegate)
+      : delegate_(delegate) {
     box_layout_ = SetLayoutManager(
         std::make_unique<views::BoxLayout>(views::BoxLayout::kVertical));
   }
@@ -212,8 +213,7 @@ class ScrollContentsView : public views::View {
       }
       if (header.draw_separator_below != draw_separator_below) {
         header.draw_separator_below = draw_separator_below;
-        TrayPopupUtils::ShowStickyHeaderSeparator(header_view,
-                                                  draw_separator_below);
+        delegate_->ShowStickyHeaderSeparator(header_view, draw_separator_below);
       }
       if (header.natural_offset < scroll_offset)
         break;
@@ -253,6 +253,8 @@ class ScrollContentsView : public views::View {
     canvas->DrawRect(shadowed_area, flags);
   }
 
+  DetailedViewDelegate* const delegate_;
+
   views::BoxLayout* box_layout_ = nullptr;
 
   // Header child views that stick to the top of visible viewport when scrolled.
@@ -313,7 +315,7 @@ void TrayDetailedView::CreateTitleRow(int string_id) {
 
 void TrayDetailedView::CreateScrollableList() {
   DCHECK(!scroller_);
-  scroll_content_ = new ScrollContentsView();
+  scroll_content_ = new ScrollContentsView(delegate_);
   scroller_ = new views::ScrollView;
   scroller_->set_draw_overflow_indicator(
       delegate_->IsOverflowIndicatorEnabled());
@@ -428,6 +430,10 @@ views::Button* TrayDetailedView::CreateHelpButton() {
   return delegate_->CreateHelpButton(this);
 }
 
+views::Separator* TrayDetailedView::CreateListSubHeaderSeparator() {
+  return delegate_->CreateListSubHeaderSeparator();
+}
+
 void TrayDetailedView::HandleViewClicked(views::View* view) {
   NOTREACHED();
 }

ash/system/tray/tray_detailed_view.h

@@ -23,6 +23,7 @@ class BoxLayout;
 class Button;
 class ProgressBar;
 class ScrollView;
+class Separator;
 }  // namespace views
 
 namespace ash {
@@ -108,6 +109,11 @@ class ASH_EXPORT TrayDetailedView : public views::View,
   views::Button* CreateSettingsButton(int setting_accessible_name_id);
   views::Button* CreateHelpButton();
 
+  // Create a horizontal separator line to be drawn between rows in a detailed
+  // view above the sub-header rows. Caller takes ownership of the returned
+  // view.
+  views::Separator* CreateListSubHeaderSeparator();
+
   // Closes the bubble that contains the detailed view.
   void CloseBubble();
 

ash/system/tray_accessibility.cc

@@ -276,8 +276,7 @@ void AccessibilityDetailedView::AppendAccessibilityList() {
           IDS_ASH_STATUS_TRAY_ACCESSIBILITY_VIRTUAL_KEYBOARD),
       virtual_keyboard_enabled_);
 
-  scroll_content()->AddChildView(
-      TrayPopupUtils::CreateListSubHeaderSeparator());
+  scroll_content()->AddChildView(CreateListSubHeaderSeparator());
 
   AddScrollListSubHeader(IDS_ASH_STATUS_TRAY_ACCESSIBILITY_ADDITIONAL_SETTINGS);
 

ash/system/unified/unified_detailed_view_delegate.cc

@@ -146,6 +146,30 @@ views::View* UnifiedDetailedViewDelegate::CreateTitleSeparator() {
   return separator;
 }
 
+void UnifiedDetailedViewDelegate::ShowStickyHeaderSeparator(
+    views::View* view,
+    bool show_separator) {
+  if (show_separator) {
+    view->SetBorder(views::CreatePaddedBorder(
+        views::CreateSolidSidedBorder(0, 0, kSeparatorWidth, 0,
+                                      kUnifiedMenuSeparatorColor),
+        gfx::Insets(kMenuSeparatorVerticalPadding, 0,
+                    kMenuSeparatorVerticalPadding - kSeparatorWidth, 0)));
+  } else {
+    view->SetBorder(views::CreateEmptyBorder(
+        gfx::Insets(kMenuSeparatorVerticalPadding, 0)));
+  }
+  view->SchedulePaint();
+}
+
+views::Separator* UnifiedDetailedViewDelegate::CreateListSubHeaderSeparator() {
+  views::Separator* separator = new views::Separator();
+  separator->SetColor(kUnifiedMenuSeparatorColor);
+  separator->SetBorder(views::CreateEmptyBorder(
+      kMenuSeparatorVerticalPadding - views::Separator::kThickness, 0, 0, 0));
+  return separator;
+}
+
 HoverHighlightView* UnifiedDetailedViewDelegate::CreateScrollListItem(
     ViewClickListener* listener,
     const gfx::VectorIcon& icon,

ash/system/unified/unified_detailed_view_delegate.h

@@ -26,6 +26,9 @@ class UnifiedDetailedViewDelegate : public DetailedViewDelegate {
   bool IsOverflowIndicatorEnabled() const override;
   TriView* CreateTitleRow(int string_id) override;
   views::View* CreateTitleSeparator() override;
+  void ShowStickyHeaderSeparator(views::View* view,
+                                 bool show_separator) override;
+  views::Separator* CreateListSubHeaderSeparator() override;
   HoverHighlightView* CreateScrollListItem(ViewClickListener* listener,
                                            const gfx::VectorIcon& icon,
                                            const base::string16& text) override;