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

chrome/browser/chromeos/options/wifi_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/wifi_config_view.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/options/network_config_view.h"
@@ skipping 110 matching lines @@
   }
   return true;
 }
 
 bool WifiConfigView::Save() {
   // Save password and auto-connect here.
   if (!other_network_) {
     bool changed = false;
 
     bool auto_connect = autoconnect_checkbox_->checked();
-    if (auto_connect != wifi_.auto_connect) {
-      wifi_.auto_connect = auto_connect;
+    if (auto_connect != wifi_.auto_connect()) {
+      wifi_.set_auto_connect(auto_connect);
       changed = true;
     }
 
     if (passphrase_textfield_) {
       const std::string& passphrase =
           UTF16ToUTF8(passphrase_textfield_->text());
-      if (passphrase != wifi_.passphrase) {
-        wifi_.passphrase = passphrase;
+      if (passphrase != wifi_.passphrase()) {
+        wifi_.set_passphrase(passphrase);
         changed = true;
       }
     }
 
     if (changed)
       CrosLibrary::Get()->GetNetworkLibrary()->SaveWifiNetwork(wifi_);
   }
   return true;
 }
 
@@ skipping 31 matching lines @@
                         views::GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, column_view_set_id);
   layout->AddView(new views::Label(l10n_util::GetString(
       IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SSID)));
   if (other_network_) {
     ssid_textfield_ = new views::Textfield(views::Textfield::STYLE_DEFAULT);
     ssid_textfield_->SetController(this);
     layout->AddView(ssid_textfield_);
   } else {
-    views::Label* label = new views::Label(ASCIIToWide(wifi_.ssid));
+    views::Label* label = new views::Label(ASCIIToWide(wifi_.name()));
     label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
     layout->AddView(label);
   }
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
 
   // Add ID and cert password if we're using 802.1x
   // XXX we're cheating and assuming 802.1x means EAP-TLS - not true
   // in general, but very common. WPA Supplicant doesn't report the
   // EAP type because it's unknown until the process begins, and we'd
   // need some kind of callback.
-  if (wifi_.encrypted && wifi_.encryption == SECURITY_8021X) {
+  if (wifi_.encrypted() && wifi_.encryption() == SECURITY_8021X) {
     layout->StartRow(0, column_view_set_id);
     layout->AddView(new views::Label(l10n_util::GetString(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_IDENTITY)));
     identity_textfield_ = new views::Textfield(
         views::Textfield::STYLE_DEFAULT);
     identity_textfield_->SetController(this);
     layout->AddView(identity_textfield_);
     layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
     layout->StartRow(0, column_view_set_id);
     layout->AddView(new views::Label(l10n_util::GetString(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT)));
     certificate_browse_button_ = new views::NativeButton(this,
                                                          l10n_util::GetString(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_BUTTON));
     layout->AddView(certificate_browse_button_);
     layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   }
 
   // Add passphrase if other_network or wifi is encrypted.
-  if (other_network_ || wifi_.encrypted) {
+  if (other_network_ || wifi_.encrypted()) {
     layout->StartRow(0, column_view_set_id);
     int label_text_id;
-    if (wifi_.encryption == SECURITY_8021X)
+    if (wifi_.encryption() == SECURITY_8021X)
       label_text_id = IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT;
     else
       label_text_id = IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PASSPHRASE;
     layout->AddView(new views::Label(l10n_util::GetString(label_text_id)));
     passphrase_textfield_ = new views::Textfield(
         views::Textfield::STYLE_PASSWORD);
     passphrase_textfield_->SetController(this);
-    if (!wifi_.passphrase.empty())
-      passphrase_textfield_->SetText(UTF8ToUTF16(wifi_.passphrase));
+    if (!wifi_.passphrase().empty())
+      passphrase_textfield_->SetText(UTF8ToUTF16(wifi_.passphrase()));
     layout->AddView(passphrase_textfield_);
     // Password visible button.
     passphrase_visible_button_ = new views::ImageButton(this);
     passphrase_visible_button_->SetImage(views::ImageButton::BS_NORMAL,
         ResourceBundle::GetSharedInstance().
         GetBitmapNamed(IDR_STATUSBAR_NETWORK_SECURE));
     passphrase_visible_button_->SetImageAlignment(
         views::ImageButton::ALIGN_CENTER, views::ImageButton::ALIGN_MIDDLE);
     layout->AddView(passphrase_visible_button_);
     layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   }
 
   // Autoconnect checkbox
   autoconnect_checkbox_ = new views::Checkbox(
       l10n_util::GetString(IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_AUTO_CONNECT));
   // For other network, default to autoconnect.
-  bool autoconnect = other_network_ || wifi_.auto_connect;
+  bool autoconnect = other_network_ || wifi_.auto_connect();
   autoconnect_checkbox_->SetChecked(autoconnect);
   layout->StartRow(0, column_view_set_id);
   layout->AddView(autoconnect_checkbox_, 3, 1);
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
 }
 
 }  // namespace chromeos