OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/chromeos/options/internet_page_view.h" | 5 #include "chrome/browser/chromeos/options/internet_page_view.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "app/l10n_util.h" | 9 #include "app/l10n_util.h" |
10 #include "app/resource_bundle.h" | 10 #include "app/resource_bundle.h" |
(...skipping 430 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
441 | 441 |
442 void RememberedSection::InitSection() { | 442 void RememberedSection::InitSection() { |
443 NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary(); | 443 NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary(); |
444 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); | 444 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); |
445 | 445 |
446 // Wifi | 446 // Wifi |
447 wifi_networks_ = cros->remembered_wifi_networks(); | 447 wifi_networks_ = cros->remembered_wifi_networks(); |
448 for (size_t i = 0; i < wifi_networks_.size(); ++i) { | 448 for (size_t i = 0; i < wifi_networks_.size(); ++i) { |
449 std::wstring name = ASCIIToWide(wifi_networks_[i].name()); | 449 std::wstring name = ASCIIToWide(wifi_networks_[i].name()); |
450 | 450 |
451 SkBitmap icon = *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS0); | 451 SkBitmap icon = *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS0_BLACK); |
452 if (wifi_networks_[i].encrypted()) { | 452 if (wifi_networks_[i].encrypted()) { |
453 icon = NetworkMenu::IconForDisplay(icon, | 453 icon = NetworkMenu::IconForDisplay(icon, |
454 *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_SECURE)); | 454 *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_SECURE)); |
455 } | 455 } |
456 | 456 |
457 AddNetwork(i, icon, name, false, std::wstring(), FORGET_BUTTON, TYPE_WIFI); | 457 AddNetwork(i, icon, name, false, std::wstring(), FORGET_BUTTON, TYPE_WIFI); |
458 } | 458 } |
459 | 459 |
460 // Cellular | 460 // Cellular |
461 celluar_networks_ = cros->remembered_cellular_networks(); | 461 celluar_networks_ = cros->remembered_cellular_networks(); |
462 // Cellular networks ssids. | 462 // Cellular networks ssids. |
463 for (size_t i = 0; i < celluar_networks_.size(); ++i) { | 463 for (size_t i = 0; i < celluar_networks_.size(); ++i) { |
464 std::wstring name = ASCIIToWide(celluar_networks_[i].name()); | 464 std::wstring name = ASCIIToWide(celluar_networks_[i].name()); |
465 | 465 |
466 SkBitmap icon = *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS0); | 466 SkBitmap icon = *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS0_BLACK); |
467 // TODO(chocobo): Check cellular network 3g/edge. | 467 // TODO(chocobo): Check cellular network 3g/edge. |
468 SkBitmap badge = *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_3G); | 468 SkBitmap badge = *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_3G); |
469 // SkBitmap badge = *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_EDGE); | 469 // SkBitmap badge = *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_EDGE); |
470 icon = NetworkMenu::IconForDisplay(icon, badge); | 470 icon = NetworkMenu::IconForDisplay(icon, badge); |
471 | 471 |
472 AddNetwork(i, icon, name, false, std::wstring(), FORGET_BUTTON, | 472 AddNetwork(i, icon, name, false, std::wstring(), FORGET_BUTTON, |
473 TYPE_CELLULAR); | 473 TYPE_CELLULAR); |
474 } | 474 } |
475 } | 475 } |
476 | 476 |
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
612 scroll_view_->SetBounds(GetLocalBounds(false)); | 612 scroll_view_->SetBounds(GetLocalBounds(false)); |
613 scroll_view_->Layout(); | 613 scroll_view_->Layout(); |
614 } | 614 } |
615 | 615 |
616 void InternetPageView::InitControlLayout() { | 616 void InternetPageView::InitControlLayout() { |
617 AddChildView(scroll_view_); | 617 AddChildView(scroll_view_); |
618 scroll_view_->SetContents(contents_view_); | 618 scroll_view_->SetContents(contents_view_); |
619 } | 619 } |
620 | 620 |
621 } // namespace chromeos | 621 } // namespace chromeos |
OLD | NEW |