Cleanup network type matching.

ash/system/chromeos/network/tray_network.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/chromeos/network/tray_network.h"
 
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/system/chromeos/network/network_icon_animation.h"
 #include "ash/system/chromeos/network/network_state_list_detailed_view.h"
 #include "ash/system/chromeos/network/tray_network_state_observer.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_item_more.h"
 #include "ash/system/tray/tray_item_view.h"
 #include "ash/system/tray/tray_utils.h"
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
+#include "chromeos/network/shill_property_util.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/link_listener.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/widget/widget.h"
 
 using chromeos::NetworkHandler;
 using chromeos::NetworkState;
 using chromeos::NetworkStateHandler;
+using chromeos::NetworkTypePattern;
 
 namespace ash {
 namespace internal {
 
 namespace tray {
 
 class NetworkTrayView : public TrayItemView,
                         public network_icon::AnimationObserver {
  public:
   explicit NetworkTrayView(TrayNetwork* network_tray)
@@ skipping 24 matching lines @@
     bool animating = false;
     network_icon::GetDefaultNetworkImageAndLabel(
         network_icon::ICON_TYPE_TRAY, &image, &name, &animating);
     bool show_in_tray = !image.isNull();
     UpdateIcon(show_in_tray, image);
     if (animating)
       network_icon::NetworkIconAnimation::GetInstance()->AddObserver(this);
     else
       network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
     // Update accessibility.
-    const NetworkState* connected_network = handler->ConnectedNetworkByType(
-        NetworkStateHandler::kMatchTypeNonVirtual);
+    const NetworkState* connected_network =
+        handler->ConnectedNetworkByType(NetworkTypePattern::NonVirtual());
     if (connected_network)
       UpdateConnectionStatus(UTF8ToUTF16(connected_network->name()), true);
     else
       UpdateConnectionStatus(base::string16(), false);
   }
 
   // views::View override.
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE {
     state->name = connection_status_string_;
     state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
@@ skipping 119 matching lines @@
   virtual void Layout() OVERRIDE {
     // Center both views vertically.
     views::View::Layout();
     image_view_->SetY(
         (height() - image_view_->GetPreferredSize().height()) / 2);
     label_view_->SetY(
         (height() - label_view_->GetPreferredSize().height()) / 2);
   }
 
   void Update() {
-    bool wifi_enabled = NetworkHandler::Get()->network_state_handler()->
-        IsTechnologyEnabled(flimflam::kTypeWifi);
+    bool wifi_enabled =
+        NetworkHandler::Get()->network_state_handler()->IsTechnologyEnabled(
+            NetworkTypePattern::Primitive(flimflam::kTypeWifi));

[stevenjb, 2013/09/03 16:22:43]

NEtworkTypePattern::Wifi()?

[pneubeck (no reviews), 2013/09/04 12:57:29]

Done.

     const int image_id = wifi_enabled ?
         IDR_AURA_UBER_TRAY_WIFI_ENABLED : IDR_AURA_UBER_TRAY_WIFI_DISABLED;
     ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
     image_view_->SetImage(bundle.GetImageNamed(image_id).ToImageSkia());
 
     const int string_id = wifi_enabled ?
         IDS_ASH_STATUS_TRAY_NETWORK_WIFI_ENABLED :
         IDS_ASH_STATUS_TRAY_NETWORK_WIFI_DISABLED;
     label_view_->SetText(bundle.GetLocalizedString(string_id));
     label_view_->SizeToFit(kTrayPopupMinWidth -
@@ skipping 77 matching lines @@
 }
 
 void TrayNetwork::RequestToggleWifi() {
   // This will always be triggered by a user action (e.g. keyboard shortcut)
   if (!detailed_ ||
       detailed_->GetViewType() == tray::NetworkDetailedView::WIFI_VIEW) {
     request_wifi_view_ = true;
     PopupDetailedView(kTrayPopupAutoCloseDelayForTextInSeconds, false);
   }
   NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
-  bool enabled = handler->IsTechnologyEnabled(flimflam::kTypeWifi);
-  handler->SetTechnologyEnabled(
-      flimflam::kTypeWifi, !enabled,
-      chromeos::network_handler::ErrorCallback());
+  bool enabled = handler->IsTechnologyEnabled(NetworkTypePattern::WiFi());
+  handler->SetTechnologyEnabled(NetworkTypePattern::WiFi(),
+                                !enabled,
+                                chromeos::network_handler::ErrorCallback());
 }
 
 void TrayNetwork::NetworkStateChanged(bool list_changed) {
   if (tray_)
     tray_->UpdateNetworkStateHandlerIcon();
   if (default_)
     default_->Update();
   if (detailed_) {
     if (list_changed)
       detailed_->NetworkListChanged();
     else
       detailed_->ManagerChanged();
   }
 }
 
 void TrayNetwork::NetworkServiceChanged(const chromeos::NetworkState* network) {
   if (detailed_)
     detailed_->NetworkServiceChanged(network);
 }
 
 }  // namespace internal
 }  // namespace ash