Landing change for ers@chromium.org: http://codereview.chromium.org/4134012/s...

chrome/browser/chromeos/options/internet_page_view.cc

 // 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/internet_page_view.h"
 
 #include <string>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 283 matching lines @@
   // For |connecting| or |connected| networks, the name is bold.
   // The status is "Connecting" if |connecting|, "Connected" if |connected|,
   // or "Disconnected".
   // For connected networks, we show the disconnect and options buttons.
   // For !connected and !connecting networks, we show the connect button.
   void AddWirelessNetwork(int id, const SkBitmap& icon,
                           const std::wstring& name, bool connecting,
                           bool connected, int connection_type);
 
   WifiNetworkVector wifi_networks_;
-  CellularNetworkVector celluar_networks_;
+  CellularNetworkVector cellular_networks_;
 
   DISALLOW_COPY_AND_ASSIGN(WirelessSection);
 };
 
 WirelessSection::WirelessSection(InternetPageContentView* parent,
                                  Profile* profile)
     : NetworkSection(parent, profile,
                      IDS_OPTIONS_SETTINGS_SECTION_TITLE_WIRELESS_NETWORK) {
 }
 
@@ skipping 12 matching lines @@
       icon = NetworkMenu::IconForDisplay(icon,
           *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_SECURE));
     }
 
     bool connecting = wifi_networks_[i]->connecting();
     bool connected = wifi_networks_[i]->connected();
     AddWirelessNetwork(i, icon, name, connecting, connected, TYPE_WIFI);
   }
 
   // Cellular
-  celluar_networks_ = cros->cellular_networks();
-  // Cellular networks ssids.
-  for (size_t i = 0; i < celluar_networks_.size(); ++i) {
-    std::wstring name = ASCIIToWide(celluar_networks_[i]->name());
+  cellular_networks_ = cros->cellular_networks();
+  for (size_t i = 0; i < cellular_networks_.size(); ++i) {
+    std::wstring name = ASCIIToWide(cellular_networks_[i]->name());
 
     SkBitmap icon = NetworkMenu::IconForNetworkStrength(
-        celluar_networks_[i]->strength(), true);
-    // TODO(chocobo): Check cellular network 3g/edge.
-    SkBitmap badge = *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_3G);
-//    SkBitmap badge = *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_EDGE);
+        cellular_networks_[i]->strength(), true);
+    SkBitmap badge =
+        NetworkMenu::BadgeForNetworkTechnology(cellular_networks_[i]);
     icon = NetworkMenu::IconForDisplay(icon, badge);
 
-    bool connecting = celluar_networks_[i]->connecting();
-    bool connected = celluar_networks_[i]->connected();
+    bool connecting = cellular_networks_[i]->connecting();
+    bool connected = cellular_networks_[i]->connected();
     AddWirelessNetwork(i, icon, name, connecting, connected, TYPE_CELLULAR);
   }
 }
 
 void WirelessSection::ButtonClicked(int button, int connection_type, int id) {
   if (connection_type == TYPE_CELLULAR) {
-    if (static_cast<int>(celluar_networks_.size()) > id) {
+    if (static_cast<int>(cellular_networks_.size()) > id) {
       if (button == CONNECT_BUTTON) {
         // Connect to cellular network.
         CrosLibrary::Get()->GetNetworkLibrary()->ConnectToCellularNetwork(
-            celluar_networks_[id]);
+            cellular_networks_[id]);
       } else if (button == DISCONNECT_BUTTON) {
         CrosLibrary::Get()->GetNetworkLibrary()->DisconnectFromWirelessNetwork(
-            celluar_networks_[id]);
+            cellular_networks_[id]);
       } else {
-        CreateModalPopup(new NetworkConfigView(celluar_networks_[id]));
+        CreateModalPopup(new NetworkConfigView(cellular_networks_[id]));
       }
     }
   } else if (connection_type == TYPE_WIFI) {
     if (static_cast<int>(wifi_networks_.size()) > id) {
       if (button == CONNECT_BUTTON) {
         // Connect to wifi here. Open password page if appropriate.
         if (wifi_networks_[id]->encrypted()) {
           NetworkConfigView* view =
               new NetworkConfigView(wifi_networks_[id], true);
           CreateModalPopup(view);
@@ skipping 44 matching lines @@
   RememberedSection(InternetPageContentView* parent, Profile* profile);
   virtual ~RememberedSection() {}
 
  protected:
   // NetworkSection overrides:
   virtual void InitSection();
   virtual void ButtonClicked(int button, int connection_type, int id);
 
  private:
   WifiNetworkVector wifi_networks_;
-  CellularNetworkVector celluar_networks_;
 
   DISALLOW_COPY_AND_ASSIGN(RememberedSection);
 };
 
 RememberedSection::RememberedSection(InternetPageContentView* parent,
                                      Profile* profile)
     : NetworkSection(parent, profile,
                      IDS_OPTIONS_SETTINGS_SECTION_TITLE_REMEMBERED_NETWORK) {
 }
 
@@ skipping 121 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // InternetPageView
 
 InternetPageView::InternetPageView(Profile* profile)
     : SettingsPageView(profile),
       contents_view_(new InternetPageContentView(profile)),
       scroll_view_(new views::ScrollView) {
   NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
   cros->UpdateSystemInfo();
-  cros->AddObserver(this);
+  cros->AddNetworkManagerObserver(this);
 }
 
 InternetPageView::~InternetPageView() {
-  CrosLibrary::Get()->GetNetworkLibrary()->RemoveObserver(this);
+  CrosLibrary::Get()->GetNetworkLibrary()->RemoveNetworkManagerObserver(this);
 }
 
-void InternetPageView::NetworkChanged(NetworkLibrary* obj) {
+void InternetPageView::OnNetworkManagerChanged(NetworkLibrary* obj) {
   // Refresh wired, wireless, and remembered networks.
   // Remember the current scroll region, and try to scroll back afterwards.
   gfx::Rect rect = scroll_view_->GetVisibleRect();
   contents_view_->RefreshContents();
   Layout();
   scroll_view_->ScrollContentsRegionToBeVisible(rect);
 }
 
 void InternetPageView::Layout() {
   contents_view_->Layout();
   scroll_view_->SetBounds(GetLocalBounds(false));
   scroll_view_->Layout();
 }
 
 void InternetPageView::InitControlLayout() {
   AddChildView(scroll_view_);
   scroll_view_->SetContents(contents_view_);
 }
 
 }  // namespace chromeos