Minor pre-MD cleanups in chromeos network UI code (just renames).

ash/common/system/chromeos/network/network_state_list_detailed_view.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/common/system/chromeos/network/network_state_list_detailed_view.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/common/ash_constants.h"
 #include "ash/common/system/chromeos/network/network_icon.h"
 #include "ash/common/system/chromeos/network/network_icon_animation.h"
 #include "ash/common/system/chromeos/network/network_info.h"
-#include "ash/common/system/chromeos/network/network_list_md.h"
+#include "ash/common/system/chromeos/network/network_list.h"
 #include "ash/common/system/chromeos/network/network_list_view_base.h"
 #include "ash/common/system/chromeos/network/tray_network_state_observer.h"
 #include "ash/common/system/chromeos/network/vpn_list_view.h"
 #include "ash/common/system/networking_config_delegate.h"
 #include "ash/common/system/tray/fixed_sized_image_view.h"
 #include "ash/common/system/tray/hover_highlight_view.h"
 #include "ash/common/system/tray/system_menu_button.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/system_tray_controller.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
@@ skipping 47 matching lines @@
 using chromeos::NetworkTypePattern;
 
 namespace ash {
 namespace tray {
 namespace {
 
 // Delay between scan requests.
 const int kRequestScanDelaySeconds = 10;
 
 // TODO(varkha): Consolidate with a similar method in tray_bluetooth.cc.
-void SetupConnectedItemMd(HoverHighlightView* container,
-                          const base::string16& text,
-                          const gfx::ImageSkia& image) {
+void SetupConnectedItem(HoverHighlightView* container,
+                        const base::string16& text,
+                        const gfx::ImageSkia& image) {
   container->AddIconAndLabels(
       image, text,
       l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_NETWORK_STATUS_CONNECTED));
   TrayPopupItemStyle style(TrayPopupItemStyle::FontStyle::CAPTION);
   style.set_color_style(TrayPopupItemStyle::ColorStyle::CONNECTED);
   style.SetupLabel(container->sub_text_label());
 }
 
 // TODO(varkha): Consolidate with a similar method in tray_bluetooth.cc.
-void SetupConnectingItemMd(HoverHighlightView* container,
-                           const base::string16& text,
-                           const gfx::ImageSkia& image) {
+void SetupConnectingItem(HoverHighlightView* container,
+                         const base::string16& text,
+                         const gfx::ImageSkia& image) {
   container->AddIconAndLabels(
       image, text,
       l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_NETWORK_STATUS_CONNECTING));
   ThrobberView* throbber = new ThrobberView;
   throbber->Start();
   container->AddRightView(throbber);
 }
 
 }  // namespace
 
@@ skipping 381 matching lines @@
   base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&NetworkStateListDetailedView::CallRequestScan, AsWeakPtr()),
       base::TimeDelta::FromSeconds(kRequestScanDelaySeconds));
 }
 
 views::View* NetworkStateListDetailedView::CreateViewForNetwork(
     const NetworkInfo& info) {
   HoverHighlightView* container = new HoverHighlightView(this);
   if (info.connected)
-    SetupConnectedItemMd(container, info.label, info.image);
+    SetupConnectedItem(container, info.label, info.image);
   else if (info.connecting)
-    SetupConnectingItemMd(container, info.label, info.image);
+    SetupConnectingItem(container, info.label, info.image);
   else
     container->AddIconAndLabel(info.image, info.label, info.highlight);
   container->set_tooltip(info.tooltip);
   views::View* controlled_icon = CreateControlledByExtensionView(info);
   if (controlled_icon)
     container->AddChildView(controlled_icon);
   return container;
 }
 
 NetworkTypePattern NetworkStateListDetailedView::GetNetworkTypePattern() const {
   return list_type_ == LIST_TYPE_VPN ? NetworkTypePattern::VPN()
                                      : NetworkTypePattern::NonVirtual();
 }
 
 void NetworkStateListDetailedView::UpdateViewForNetwork(
     views::View* view,
     const NetworkInfo& info) {
   HoverHighlightView* container = static_cast<HoverHighlightView*>(view);
   DCHECK(!container->has_children());
   if (info.connected)
-    SetupConnectedItemMd(container, info.label, info.image);
+    SetupConnectedItem(container, info.label, info.image);
   else if (info.connecting)
-    SetupConnectingItemMd(container, info.label, info.image);
+    SetupConnectingItem(container, info.label, info.image);
   else
     container->AddIconAndLabel(info.image, info.label, info.highlight);
   views::View* controlled_icon = CreateControlledByExtensionView(info);
   container->set_tooltip(info.tooltip);
   if (controlled_icon)
     view->AddChildView(controlled_icon);
 }
 
 views::Label* NetworkStateListDetailedView::CreateInfoLabel() {
   views::Label* label = new views::Label();
@@ skipping 14 matching lines @@
       UMA_STATUS_AREA_NETWORK_JOIN_OTHER_CLICKED);
   Shell::Get()->system_tray_controller()->ShowNetworkCreate(shill::kTypeWifi);
 }
 
 void NetworkStateListDetailedView::RelayoutScrollList() {
   scroller()->Layout();
 }
 
 }  // namespace tray
 }  // namespace ash