Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(277)

Unified Diff: ash/system/tray/tray_details_view.cc

Issue 2957043002: Add a row in the network tray to inform users to turn Bluetooth on to enable Tether. (Closed)
Patch Set: khorimoto@ and jamescook@ comments Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/system/tray/tray_details_view.cc
diff --git a/ash/system/tray/tray_details_view.cc b/ash/system/tray/tray_details_view.cc
index f4507f0779185c5f8924c021d5a87d7975fa7729..45368bd48e686b4f7bcf97633b8866e6cbd93667 100644
--- a/ash/system/tray/tray_details_view.cc
+++ b/ash/system/tray/tray_details_view.cc
@@ -17,6 +17,7 @@
#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"
Kyle Horimoto 2017/07/12 22:45:58 Remove.
lesliewatkins 2017/07/13 22:12:47 Done.
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/compositor/paint_context.h"
@@ -237,35 +238,6 @@ const int kTitleRowPaddingBottom =
} // namespace
-////////////////////////////////////////////////////////////////////////////////
-// TrayDetailsView::InfoLabel:
-
-TrayDetailsView::InfoLabel::InfoLabel(int message_id)
- : 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);
-
- SetMessage(message_id);
-}
-
-TrayDetailsView::InfoLabel::~InfoLabel() {}
-
-void TrayDetailsView::InfoLabel::SetMessage(int message_id) {
- label_->SetText(l10n_util::GetStringUTF16(message_id));
-}
////////////////////////////////////////////////////////////////////////////////
// TrayDetailsView:

Powered by Google App Engine
This is Rietveld 408576698