Refactor WifiNetwork, CellularNetwork, and EthernetNetwork into classes to ma...

chrome/browser/chromeos/options/network_config_view.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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 "chrome/browser/chromeos/options/network_config_view.h"
 
 #include "app/l10n_util.h"
 #include "base/string_util.h"
 #include "chrome/browser/chromeos/options/ip_config_view.h"
 #include "chrome/browser/chromeos/options/wifi_config_view.h"
 #include "grit/chromium_strings.h"
@@ skipping 66 matching lines @@
     else
       return wificonfig_view_->Save();
   }
   return true;
 }
 
 std::wstring NetworkConfigView::GetWindowTitle() const {
   if (flags_ & FLAG_OTHER_NETWORK)
     return l10n_util::GetString(IDS_OPTIONS_SETTINGS_OTHER_NETWORKS);
   if (flags_ & FLAG_WIFI)
-    return ASCIIToWide(wifi_.ssid);
+    return ASCIIToWide(wifi_.name());
   if (flags_ & FLAG_CELLULAR)
-    return ASCIIToWide(cellular_.name);
+    return ASCIIToWide(cellular_.name());
   return l10n_util::GetString(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET);
 }
 
 void NetworkConfigView::TabSelectedAt(int index) {
 }
 
 void NetworkConfigView::SetLoginTextfieldFocus() {
   wificonfig_view_->FocusFirstField();
 }
 
@@ skipping 27 matching lines @@
       wificonfig_view_ = new WifiConfigView(this);
     else
       wificonfig_view_ = new WifiConfigView(this, wifi_);
     tabs_->AddTab(
         l10n_util::GetString(IDS_OPTIONS_SETTINGS_SECTION_TITLE_WIFI_CONFIG),
         wificonfig_view_);
   }
 
   if (flags_ & FLAG_SHOW_IPCONFIG) {
     if (flags_ & FLAG_WIFI)
-      ipconfig_view_ = new IPConfigView(wifi_.device_path);
+      ipconfig_view_ = new IPConfigView(wifi_.device_path());
     else if (flags_ & FLAG_CELLULAR)
-      ipconfig_view_ = new IPConfigView(cellular_.device_path);
+      ipconfig_view_ = new IPConfigView(cellular_.device_path());
     else
-      ipconfig_view_ = new IPConfigView(ethernet_.device_path);
+      ipconfig_view_ = new IPConfigView(ethernet_.device_path());
     tabs_->AddTab(
         l10n_util::GetString(IDS_OPTIONS_SETTINGS_SECTION_TITLE_IP_CONFIG),
         ipconfig_view_);
   }
 }
 
 }  // namespace chromeos