Merge 63984 - New statusbar images for ChromeOS....

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 430 matching lines @@
 
 void RememberedSection::InitSection() {
   NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 
   // Wifi
   wifi_networks_ = cros->remembered_wifi_networks();
   for (size_t i = 0; i < wifi_networks_.size(); ++i) {
     std::wstring name = ASCIIToWide(wifi_networks_[i].name());
 
-    SkBitmap icon = *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS0);
+    SkBitmap icon = *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS0_BLACK);
     if (wifi_networks_[i].encrypted()) {
       icon = NetworkMenu::IconForDisplay(icon,
           *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_SECURE));
     }
 
     AddNetwork(i, icon, name, false, std::wstring(), FORGET_BUTTON, TYPE_WIFI);
   }
 
   // Cellular
   celluar_networks_ = cros->remembered_cellular_networks();
   // Cellular networks ssids.
   for (size_t i = 0; i < celluar_networks_.size(); ++i) {
     std::wstring name = ASCIIToWide(celluar_networks_[i].name());
 
-    SkBitmap icon = *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS0);
+    SkBitmap icon = *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS0_BLACK);
     // TODO(chocobo): Check cellular network 3g/edge.
     SkBitmap badge = *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_3G);
 //    SkBitmap badge = *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_EDGE);
     icon = NetworkMenu::IconForDisplay(icon, badge);
 
     AddNetwork(i, icon, name, false, std::wstring(), FORGET_BUTTON,
                TYPE_CELLULAR);
   }
 }
 
@@ skipping 135 matching lines @@
   scroll_view_->SetBounds(GetLocalBounds(false));
   scroll_view_->Layout();
 }
 
 void InternetPageView::InitControlLayout() {
   AddChildView(scroll_view_);
   scroll_view_->SetContents(contents_view_);
 }
 
 }  // namespace chromeos