Add Tether to Mobile NetworkTypePattern.

ash/system/network/network_icon.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/network/network_icon.h"
 
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "ash/system/network/network_icon_animation.h"
 #include "ash/system/network/network_icon_animation_observer.h"
@@ skipping 865 matching lines @@
   } else {
     return base::UTF8ToUTF16(network->name());
   }
 }
 
 int GetCellularUninitializedMsg() {
   static base::Time s_uninitialized_state_time;
   static int s_uninitialized_msg(0);
 
   NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
-  if (handler->GetTechnologyState(NetworkTypePattern::Mobile()) ==
+  if (handler->GetTechnologyState(NetworkTypePattern::Cellular()) ==

[Kyle Horimoto, 2017/06/01 22:12:23]

Do we still want this behavior for WiMAX?

[stevenjb, 2017/06/01 22:29:47]

Actually yes, this should still be Mobile(). This is called from
network_list.cc, and even though we say Cellular, we basically treat WiMAX the
same. We should probably s/Cellular/Mobile throughout this function.

Tether state will only be returned if Cellular and WiMAX are unavailable. We can
decide to either show 'Initializing...' when Tether is uninitialized, show
something else (e.g. 'Enable bluetooth...'), or exclude Tether here.

[lesliewatkins, 2017/06/02 21:31:17]

Done.

Switched it back to Mobile, changed the name of the function, and added a TODO
to create a more descriptive message if Tether is uninitialized.

       NetworkStateHandler::TECHNOLOGY_UNINITIALIZED) {
     s_uninitialized_msg = IDS_ASH_STATUS_TRAY_INITIALIZING_CELLULAR;
     s_uninitialized_state_time = base::Time::Now();
     return s_uninitialized_msg;
-  } else if (handler->GetScanningByType(NetworkTypePattern::Mobile())) {
+  } else if (handler->GetScanningByType(NetworkTypePattern::Cellular())) {

[stevenjb, 2017/06/01 22:29:47]

This seems like we want to include Tether; if it sets scanning() then we
probably want to show that state and if it doesn't then it doesn't matter.

[lesliewatkins, 2017/06/02 21:31:17]

Done.

     s_uninitialized_msg = IDS_ASH_STATUS_TRAY_MOBILE_SCANNING;
     s_uninitialized_state_time = base::Time::Now();
     return s_uninitialized_msg;
   }
   // There can be a delay between leaving the Initializing state and when
   // a Cellular device shows up, so keep showing the initializing
   // animation for a bit to avoid flashing the disconnect icon.
   const int kInitializingDelaySeconds = 1;
   base::TimeDelta dtime = base::Time::Now() - s_uninitialized_state_time;
   if (dtime.InSeconds() < kInitializingDelaySeconds)
@@ skipping 91 matching lines @@
     network_paths.insert((*iter)->path());
   }
   PurgeIconMap(ICON_TYPE_TRAY, network_paths);
   PurgeIconMap(ICON_TYPE_DEFAULT_VIEW, network_paths);
   PurgeIconMap(ICON_TYPE_LIST, network_paths);
   PurgeIconMap(ICON_TYPE_MENU_LIST, network_paths);
 }
 
 }  // namespace network_icon
 }  // namespace ash