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

Unified Diff: ash/system/network/network_icon.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/bluetooth/tray_bluetooth.cc ('k') | ash/system/network/network_list.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/network/network_icon.cc
diff --git a/ash/system/network/network_icon.cc b/ash/system/network/network_icon.cc
index b19b3a037f01bea33f1314c3f41a6f163b78d60d..b1ce16d882d8d694e78d9d7c4fe10ae829a811d3 100644
--- a/ash/system/network/network_icon.cc
+++ b/ash/system/network/network_icon.cc
@@ -876,10 +876,15 @@ int GetMobileUninitializedMsg() {
static int s_uninitialized_msg(0);
NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
- if (handler->GetTechnologyState(NetworkTypePattern::Mobile()) ==
+ // TODO(lesliewatkins): Only return this message when Tether is uninitialized
+ // due to no Bluetooth (dependent on codereview.chromium.org/2969493002/).
+ if (handler->GetTechnologyState(NetworkTypePattern::Tether()) ==
NetworkStateHandler::TECHNOLOGY_UNINITIALIZED) {
- // TODO (lesliewatkins): Add a more descriptive message (e.g. "Enable
- // Bluetooth") for Tether technology type.
+ s_uninitialized_msg = IDS_ASH_STATUS_TRAY_ENABLE_BLUETOOTH;
+ s_uninitialized_state_time = base::Time::Now();
+ return s_uninitialized_msg;
+ } else if (handler->GetTechnologyState(NetworkTypePattern::Mobile()) ==
+ NetworkStateHandler::TECHNOLOGY_UNINITIALIZED) {
s_uninitialized_msg = IDS_ASH_STATUS_TRAY_INITIALIZING_CELLULAR;
s_uninitialized_state_time = base::Time::Now();
return s_uninitialized_msg;
« no previous file with comments | « ash/system/bluetooth/tray_bluetooth.cc ('k') | ash/system/network/network_list.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698