Add a row in the network tray to inform users to turn Bluetooth on to enable Tether.

ash/system/tray/tray_details_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

[Kyle Horimoto, 2017/07/10 18:37:08]

Please add a test for your clickable label in tray_details_view_unittest.cc.

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/system/tray/tray_details_view.h"
 
 #include "ash/ash_view_ids.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "ash/system/tray/hover_highlight_view.h"
 #include "ash/system/tray/system_menu_button.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_item.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_popup_item_style.h"
 #include "ash/system/tray/tray_popup_utils.h"
 #include "ash/system/tray/tri_view.h"
 #include "base/containers/adapters.h"
 #include "base/memory/ptr_util.h"
 #include "third_party/skia/include/core/SkDrawLooper.h"
+#include "ui/accessibility/ax_node_data.h"
 #include "ui/base/l10n/l10n_util.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/geometry/insets.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/skia_paint_util.h"
 #include "ui/gfx/vector_icon_types.h"
@@ skipping 203 matching lines @@
 const int kTitleRowProgressBarHeight = 2;
 const int kTitleRowPaddingTop = kTitleRowVerticalPadding;
 const int kTitleRowPaddingBottom =
     kTitleRowVerticalPadding - kTitleRowProgressBarHeight;
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // TrayDetailsView::InfoLabel:
 
-TrayDetailsView::InfoLabel::InfoLabel(int message_id)
-    : label_(TrayPopupUtils::CreateDefaultLabel()) {
+TrayDetailsView::InfoLabel::InfoLabel(int message_id,
+                                      InfoLabelDelegate* delegate)
+    : ActionableView(nullptr /*owner*/, TrayPopupInkDropStyle::FILL_BOUNDS),
+      label_(TrayPopupUtils::CreateDefaultLabel()),
+      message_id_(message_id),
+      delegate_(delegate) {
   SetLayoutManager(new views::FillLayout);
 
-  TrayPopupItemStyle style(TrayPopupItemStyle::FontStyle::SYSTEM_INFO);
-  style.SetupLabel(label_);
-
   TriView* tri_view = TrayPopupUtils::CreateMultiTargetRowView();
   tri_view->SetInsets(gfx::Insets(0,
                                   kMenuExtraMarginFromLeftEdge +
                                       kTrayPopupPaddingHorizontal -
                                       kTrayPopupLabelHorizontalPadding,
                                   0, kTrayPopupPaddingHorizontal));
   tri_view->SetContainerVisible(TriView::Container::START, false);
   tri_view->SetContainerVisible(TriView::Container::END, false);
   tri_view->AddView(TriView::Container::CENTER, label_);
+
   AddChildView(tri_view);
 
-  SetMessage(message_id);
+  Update(message_id);
 }
 
-TrayDetailsView::InfoLabel::~InfoLabel() {}
+void TrayDetailsView::InfoLabel::Update(int message_id) {
+  message_id_ = message_id;
 
-void TrayDetailsView::InfoLabel::SetMessage(int message_id) {
+  TrayPopupItemStyle::FontStyle font_style;

[Kyle Horimoto, 2017/07/10 18:37:08]

nit: Use a reference:

TrayPopupItemStyle::FontStyle& font_style;

[lesliewatkins, 2017/07/12 21:49:50]

This gives a compiler error-- references have to be initialized when they're
declared.

+
+  if (IsClickable()) {
+    SetInkDropMode(InkDropHostView::InkDropMode::ON);
+    font_style = TrayPopupItemStyle::FontStyle::CLICKABLE_SYSTEM_INFO;
+  } else {
+    SetInkDropMode(InkDropHostView::InkDropMode::OFF);
+    font_style = TrayPopupItemStyle::FontStyle::SYSTEM_INFO;
+  }
+
+  TrayPopupItemStyle style(font_style);

[Kyle Horimoto, 2017/07/10 18:37:07]

nit: Use const:

const TrayPopupItemStyle style(font_style);

[lesliewatkins, 2017/07/12 21:49:50]

Done.

+  style.SetupLabel(label_);
+
   label_->SetText(l10n_util::GetStringUTF16(message_id));
 }
 
+bool TrayDetailsView::InfoLabel::PerformAction(const ui::Event& event) {
+  if (delegate_)

[Kyle Horimoto, 2017/07/10 18:37:08]

nit: if (delegate_), DCHECK(IsClickable())

[lesliewatkins, 2017/07/12 21:49:50]

Just because it has a delegate doesn't mean it's clickable. The delegate could
determine that it isn't.

+    delegate_->OnLabelClicked(this);

[Kyle Horimoto, 2017/07/10 18:37:07]

/* parameter_name */

[lesliewatkins, 2017/07/12 21:49:50]

Done.

+  return true;
+}
+
+void TrayDetailsView::InfoLabel::GetAccessibleNodeData(
+    ui::AXNodeData* node_data) {
+  if (IsClickable())
+    node_data->role = ui::AX_ROLE_BUTTON;
+  else
+    node_data->role = ui::AX_ROLE_LABEL_TEXT;
+}
+
+const int& TrayDetailsView::InfoLabel::message_id() {
+  return message_id_;
+}
+
+bool TrayDetailsView::InfoLabel::IsClickable() {

[James Cook, 2017/07/10 18:43:03]

This seems like it should be a delegate method. InfoLabel feels like a pure UI
widget, so it shouldn't need to know about bluetooth.

Alternately you could pass a bool clickable in the constructor and the Update()
method.

[lesliewatkins, 2017/07/12 21:49:50]

I just had this call delegate_->IsClickable(message_id_)

+  return message_id() == IDS_ASH_STATUS_TRAY_ENABLE_BLUETOOTH;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // TrayDetailsView:
 
 TrayDetailsView::TrayDetailsView(SystemTrayItem* owner)
     : owner_(owner),
       box_layout_(new views::BoxLayout(views::BoxLayout::kVertical)),
       scroller_(nullptr),
       scroll_content_(nullptr),
       progress_bar_(nullptr),
       tri_view_(nullptr),
@@ skipping 221 matching lines @@
   if (bounds().IsEmpty())
     return views::View::GetHeightForWidth(width);
 
   // The height of the bubble that contains this detailed view is set to
   // the preferred height of the default view, and that determines the
   // initial height of |this|. Always request to stay the same height.
   return height();
 }
 
 }  // namespace ash