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

Unified Diff: ash/system/network/network_list.cc

Issue 2957043002: Add a row in the network tray to inform users to turn Bluetooth on to enable Tether. (Closed)
Patch Set: changed message ids to actual string names 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
« no previous file with comments | « ash/system/network/network_list.h ('k') | ash/system/tray/tray_details_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/network/network_list.cc
diff --git a/ash/system/network/network_list.cc b/ash/system/network/network_list.cc
index 9ed47151bdadd73493461f693f89e7b1972e9aa5..40dd9a091fa7c2bc5c14a95dcfb11444ed1c2baf 100644
--- a/ash/system/network/network_list.cc
+++ b/ash/system/network/network_list.cc
@@ -23,6 +23,7 @@
#include "ash/system/tray/system_tray_controller.h"
#include "ash/system/tray/system_tray_delegate.h"
#include "ash/system/tray/tray_constants.h"
+#include "ash/system/tray/tray_info_label.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"
@@ -630,8 +631,8 @@ void NetworkListView::PlaceViewAtIndex(views::View* view, int index) {
void NetworkListView::UpdateInfoLabel(int message_id,
int insertion_index,
- InfoLabel** info_label_ptr) {
- InfoLabel* info_label = *info_label_ptr;
+ TrayInfoLabel** info_label_ptr) {
+ TrayInfoLabel* info_label = *info_label_ptr;
if (!message_id) {
if (info_label) {
needs_relayout_ = true;
@@ -641,13 +642,23 @@ void NetworkListView::UpdateInfoLabel(int message_id,
return;
}
if (!info_label)
- info_label = new InfoLabel(message_id);
+ info_label = new TrayInfoLabel(this /* delegate */, message_id);
else
- info_label->SetMessage(message_id);
+ info_label->Update(message_id);
+
PlaceViewAtIndex(info_label, insertion_index);
*info_label_ptr = info_label;
}
+void NetworkListView::OnLabelClicked(int message_id) {
+ if (message_id == IDS_ASH_STATUS_TRAY_ENABLE_BLUETOOTH)
+ Shell::Get()->system_tray_controller()->ShowBluetoothSettings();
+}
+
+bool NetworkListView::IsLabelClickable(int message_id) const {
+ return message_id == IDS_ASH_STATUS_TRAY_ENABLE_BLUETOOTH;
+}
+
int NetworkListView::UpdateSectionHeaderRow(NetworkTypePattern pattern,
bool enabled,
int child_index,
« no previous file with comments | « ash/system/network/network_list.h ('k') | ash/system/tray/tray_details_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698