Modify Ash MD system menu layout for title rows

ash/common/system/tray/tray_details_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 "ash/common/system/tray/tray_details_view.h"
 
 #include "ash/common/ash_view_ids.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/system/tray/fixed_sized_scroll_view.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/system_tray_item.h"
 #include "ash/common/system/tray/tray_constants.h"
+#include "ash/common/system/tray/tray_popup_item_style.h"
+#include "ash/common/system/tray/tray_popup_utils.h"
 #include "base/containers/adapters.h"
+#include "grit/ash_strings.h"
 #include "third_party/skia/include/core/SkDrawLooper.h"
+#include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/paint_context.h"
 #include "ui/compositor/paint_recorder.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
+#include "ui/views/controls/label.h"
 #include "ui/views/controls/progress_bar.h"
 #include "ui/views/controls/scroll_view.h"
 #include "ui/views/controls/separator.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/view_targeter.h"
 #include "ui/views/view_targeter_delegate.h"
 
 namespace ash {
 namespace {
 
@@ skipping 226 matching lines @@
 };
 
 TrayDetailsView::TrayDetailsView(SystemTrayItem* owner)
     : owner_(owner),
       box_layout_(new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0)),
       title_row_(nullptr),
       scroller_(nullptr),
       scroll_content_(nullptr),
       progress_bar_(nullptr),
       scroll_border_(nullptr),
+      tri_view_(nullptr),
+      label_(nullptr),
       back_button_(nullptr) {
   SetLayoutManager(box_layout_);
   set_background(views::Background::CreateSolidBackground(kBackgroundColor));
 }
 
 TrayDetailsView::~TrayDetailsView() {}
 
 void TrayDetailsView::OnViewClicked(views::View* sender) {
   if (!UseMd() && title_row_ && sender == title_row_->content()) {
     TransitionToDefaultView();
     return;
   }
 
   HandleViewClicked(sender);
 }
 
 void TrayDetailsView::ButtonPressed(views::Button* sender,
                                     const ui::Event& event) {
   if (UseMd() && sender == back_button_) {
     TransitionToDefaultView();
     return;
   }
 
   HandleButtonPressed(sender, event);
 }
 
 void TrayDetailsView::CreateTitleRow(int string_id) {
-  DCHECK(!title_row_);
-  title_row_ = new SpecialPopupRow();
-  title_row_->SetTextLabel(string_id, this);
   if (UseMd()) {
-    title_row_->SetBorder(views::CreateEmptyBorder(kTitleRowPaddingTop, 0,
-                                                   kTitleRowPaddingBottom, 0));
-    AddChildViewAt(title_row_, 0);
+    DCHECK(!tri_view_);
+
+    tri_view_ = TrayPopupUtils::CreateDefaultRowView();
+
+    back_button_ = CreateBackButton();
+    tri_view_->AddView(TriView::Container::START, back_button_);
+
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+    label_ = TrayPopupUtils::CreateDefaultLabel();
+    label_->SetText(rb.GetLocalizedString(string_id));
+    TrayPopupItemStyle style(GetNativeTheme(),

[bruthig, 2016/11/14 04:39:11]

You should be reapplying the style to |label_| in OnNativeThemeChanged().

And you shouldn't be applying it here if GetNativeTheme() is null. Once
TrayPopupItemStyle is fixed to use the theme, this would crash if the theme is
not available here, e.g. |this| hasn't been added to a View yet.

[tdanderson, 2016/11/14 19:24:59]

Done.

+                             TrayPopupItemStyle::FontStyle::TITLE);
+    style.SetupLabel(label_);
+    tri_view_->AddView(TriView::Container::CENTER, label_);
+
+    tri_view_->SetContainerVisible(TriView::Container::END, false);
+
+    tri_view_->SetBorder(views::CreateEmptyBorder(kTitleRowPaddingTop, 0,
+                                                  kTitleRowPaddingBottom, 0));
+    AddChildViewAt(tri_view_, 0);
     views::Separator* separator =
         new views::Separator(views::Separator::HORIZONTAL);
     separator->SetColor(kHorizontalSeparatorColor);
     separator->SetPreferredSize(kTitleRowSeparatorHeight);
     separator->SetBorder(views::CreateEmptyBorder(
         kTitleRowProgressBarHeight - kTitleRowSeparatorHeight, 0, 0, 0));
     AddChildViewAt(separator, kTitleRowSeparatorIndex);
   } else {
+    DCHECK(!title_row_);

[bruthig, 2016/11/14 04:39:11]

If you move this DCHECK and the one on line 302 above the if statement it will
also guard against this method being called once when UseMd() returns true, and
once when it returns false.

[tdanderson, 2016/11/14 19:24:59]

Done.

+    title_row_ = new SpecialPopupRow();
+    title_row_->SetTextLabel(string_id, this);
     AddChildViewAt(title_row_, child_count());
   }
 
   CreateExtraTitleRowButtons();
-
-  if (UseMd())
-    back_button_ = title_row_->AddBackButton(this);
-
   Layout();
 }
 
 void TrayDetailsView::CreateScrollableList() {
   DCHECK(!scroller_);
   scroll_content_ = new ScrollContentsView();
   scroller_ = new FixedSizedScrollView;
   scroller_->SetContentsView(scroll_content_);
   // Make the |scroller_| have a layer to clip |scroll_content_|'s children.
   // TODO(varkha): Make the sticky rows work with EnableViewPortLayer().
@@ skipping 22 matching lines @@
     scroll_content_->AddChildView(new ScrollSeparator);
 }
 
 void TrayDetailsView::Reset() {
   RemoveAllChildViews(true);
   title_row_ = nullptr;
   scroller_ = nullptr;
   scroll_content_ = nullptr;
   progress_bar_ = nullptr;
   back_button_ = nullptr;
+  label_ = nullptr;
+  tri_view_ = nullptr;
 }
 
 void TrayDetailsView::ShowProgress(double value, bool visible) {
   DCHECK(UseMd());
-  DCHECK(title_row_);
+  DCHECK(tri_view_);
   if (!progress_bar_) {
     progress_bar_ = new views::ProgressBar(kTitleRowProgressBarHeight);
     progress_bar_->SetVisible(false);
     AddChildViewAt(progress_bar_, kTitleRowSeparatorIndex + 1);
   }
 
   progress_bar_->SetValue(value);
   progress_bar_->SetVisible(visible);
   child_at(kTitleRowSeparatorIndex)->SetVisible(!visible);
 }
 
+views::CustomButton* TrayDetailsView::CreateSettingsButton(LoginStatus status) {

[bruthig, 2016/11/14 04:39:11]

nit: Might benefit from a DCHECK(UseMd());
Same applies to CreateHelpButton() and CreateBackButton().

[tdanderson, 2016/11/14 19:24:59]

Done.

+  SystemMenuButton* button = new SystemMenuButton(
+      this, SystemMenuButton::InkDropStyle::SQUARE, kSystemMenuSettingsIcon,
+      IDS_ASH_STATUS_TRAY_SETTINGS);
+  if (!TrayPopupUtils::CanOpenWebUISettings(status))
+    button->SetState(views::Button::STATE_DISABLED);
+  return button;
+}
+
+views::CustomButton* TrayDetailsView::CreateHelpButton(LoginStatus status) {
+  SystemMenuButton* button =
+      new SystemMenuButton(this, SystemMenuButton::InkDropStyle::SQUARE,
+                           kSystemMenuHelpIcon, IDS_ASH_STATUS_TRAY_HELP);
+  if (!TrayPopupUtils::CanOpenWebUISettings(status))
+    button->SetState(views::Button::STATE_DISABLED);
+  return button;
+}
+
 void TrayDetailsView::HandleViewClicked(views::View* view) {
   NOTREACHED();
 }
 
 void TrayDetailsView::HandleButtonPressed(views::Button* sender,
                                           const ui::Event& event) {
   NOTREACHED();
 }
 
 void TrayDetailsView::CreateExtraTitleRowButtons() {}
 
 void TrayDetailsView::TransitionToDefaultView() {
   // Cache pointer to owner in this function scope. TrayDetailsView will be
   // deleted after called ShowDefaultView.
   SystemTrayItem* owner = owner_;
   if (UseMd()) {
     if (back_button_ && back_button_->HasFocus())
       owner->set_restore_focus(true);
   } else {
     if (title_row_ && title_row_->content() &&
         title_row_->content()->HasFocus()) {
       owner->set_restore_focus(true);
     }
   }
   owner->system_tray()->ShowDefaultView(BUBBLE_USE_EXISTING);
   owner->set_restore_focus(false);
 }
 
+views::Button* TrayDetailsView::CreateBackButton() {
+  SystemMenuButton* button = new SystemMenuButton(
+      this, SystemMenuButton::InkDropStyle::SQUARE, kSystemMenuArrowBackIcon,
+      IDS_ASH_STATUS_TRAY_PREVIOUS_MENU);
+  return button;
+}
+
 void TrayDetailsView::Layout() {
   if (UseMd()) {
     views::View::Layout();
     if (scroller_ && !scroller_->is_bounded())
       scroller_->ClipHeightTo(0, scroller_->height());
   }
 
   if (UseMd() || bounds().IsEmpty()) {
     views::View::Layout();
     return;
@@ skipping 38 matching lines @@
     if (index < child_count() - 1 && child_at(index + 1) != title_row_)
       scroll_border_->set_visible(true);
     else
       scroll_border_->set_visible(false);
   }
 
   views::View::OnPaintBorder(canvas);
 }
 
 }  // namespace ash