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.
 // 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/shell.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_controller.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/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 212 matching lines @@
 const int kTitleRowPaddingTop = kTitleRowVerticalPadding;
 const int kTitleRowPaddingBottom =
     kTitleRowVerticalPadding - kTitleRowProgressBarHeight;
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // TrayDetailsView::InfoLabel:
 
 TrayDetailsView::InfoLabel::InfoLabel(int message_id)
-    : label_(TrayPopupUtils::CreateDefaultLabel()) {
+    : ActionableView(nullptr, TrayPopupInkDropStyle::FILL_BOUNDS),

[Kyle Horimoto, 2017/06/27 19:36:57]

/* owner */

+      label_(TrayPopupUtils::CreateDefaultLabel()) {
   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);
 
+  Update(message_id);
+}
+
+void TrayDetailsView::InfoLabel::Update(int message_id) {
+  SetAction(message_id);
+  SetStyle();
   SetMessage(message_id);
 }
 
-TrayDetailsView::InfoLabel::~InfoLabel() {}
+void TrayDetailsView::InfoLabel::SetAction(int message_id) {
+  if (message_id == IDS_ASH_STATUS_TRAY_ENABLE_BLUETOOTH)

[tdanderson, 2017/06/27 19:33:21]

TrayDetailsView::InfoLabel is a class used (or can potentially be used) by many
different UI surfaces, so I think a more scalable design would be to not have
specific mention of bluetooth/networking/etc within this class.

While considering my other comment regarding the consequences of having
InfoLabel extend ActionableView, consider how you could also address this
concern.

+    action_ = Action::OPEN_BLUETOOTH_SETTINGS;
+  else
+    action_ = Action::NONE;
+
+  if (action_ == Action::NONE)

[Kyle Horimoto, 2017/06/27 19:36:57]

Just put these SetInkDropMode() calls in the if/else above. No need for a second
one.

+    SetInkDropMode(InkDropHostView::InkDropMode::OFF);
+  else
+    SetInkDropMode(InkDropHostView::InkDropMode::ON);
+}
+
+void TrayDetailsView::InfoLabel::SetStyle() {
+  TrayPopupItemStyle::FontStyle font_style;
+
+  if (action_ == Action::NONE)

[Kyle Horimoto, 2017/06/27 19:36:56]

You can also just merge this into the above function as well. It's cleaner if
everything is part of the same if/else.

You should also change the function name since it's not only about setting the
action.

+    font_style = TrayPopupItemStyle::FontStyle::SYSTEM_INFO;
+  else
+    font_style = TrayPopupItemStyle::FontStyle::CLICKABLE_SYSTEM_INFO;
+
+  TrayPopupItemStyle style(font_style);
+  style.SetupLabel(label_);
+}
 
 void TrayDetailsView::InfoLabel::SetMessage(int message_id) {
   label_->SetText(l10n_util::GetStringUTF16(message_id));
 }
 
+bool TrayDetailsView::InfoLabel::PerformAction(const ui::Event& event) {
+  switch (action_) {
+    case Action::OPEN_BLUETOOTH_SETTINGS:

[tdanderson, 2017/06/27 19:33:21]

Side note: please check with your PM as to whether they want to collect metrics
on how often this row is clicked. (These metrics can always be landed in a
follow-on CL.)

[Kyle Horimoto, 2017/06/27 19:36:57]

You can just use an if() instead of a switch() since there is only one condition
that triggers an action.

[Kyle Horimoto, 2017/06/27 20:37:10]

Good point. Leslie, please talk to hansberry@ regarding this - thanks! :)

[lesliewatkins, 2017/07/07 16:19:19]

Sent him a message, will follow up when I get a response.

+      Shell::Get()->system_tray_controller()->ShowBluetoothSettings();
+      break;
+    case Action::NONE:
+    default:
+      break;
+  }
+  return true;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // 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