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/dom_ui/internet_options_handler.h" | 5 #include "chrome/browser/chromeos/dom_ui/internet_options_handler.h" |
6 | 6 |
7 #include <ctype.h> | 7 #include <ctype.h> |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 948 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
959 ListValue* InternetOptionsHandler::GetRememberedList() { | 959 ListValue* InternetOptionsHandler::GetRememberedList() { |
960 chromeos::NetworkLibrary* cros = | 960 chromeos::NetworkLibrary* cros = |
961 chromeos::CrosLibrary::Get()->GetNetworkLibrary(); | 961 chromeos::CrosLibrary::Get()->GetNetworkLibrary(); |
962 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); | 962 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); |
963 ListValue* list = new ListValue(); | 963 ListValue* list = new ListValue(); |
964 | 964 |
965 const chromeos::WifiNetworkVector& wifi_networks = | 965 const chromeos::WifiNetworkVector& wifi_networks = |
966 cros->remembered_wifi_networks(); | 966 cros->remembered_wifi_networks(); |
967 for (chromeos::WifiNetworkVector::const_iterator it = | 967 for (chromeos::WifiNetworkVector::const_iterator it = |
968 wifi_networks.begin(); it != wifi_networks.end(); ++it) { | 968 wifi_networks.begin(); it != wifi_networks.end(); ++it) { |
969 SkBitmap icon = *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS0); | 969 SkBitmap icon = *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS0_BLACK); |
970 if (it->encrypted()) { | 970 if (it->encrypted()) { |
971 icon = chromeos::NetworkMenu::IconForDisplay(icon, | 971 icon = chromeos::NetworkMenu::IconForDisplay(icon, |
972 *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_SECURE)); | 972 *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_SECURE)); |
973 } | 973 } |
974 list->Append(GetNetwork( | 974 list->Append(GetNetwork( |
975 it->service_path(), | 975 it->service_path(), |
976 icon, | 976 icon, |
977 it->name(), | 977 it->name(), |
978 it->connecting(), | 978 it->connecting(), |
979 it->connected(), | 979 it->connected(), |
980 chromeos::TYPE_WIFI, | 980 chromeos::TYPE_WIFI, |
981 true, | 981 true, |
982 chromeos::ACTIVATION_STATE_UNKNOWN)); | 982 chromeos::ACTIVATION_STATE_UNKNOWN)); |
983 } | 983 } |
984 | 984 |
985 const chromeos::CellularNetworkVector& cellular_networks = | 985 const chromeos::CellularNetworkVector& cellular_networks = |
986 cros->remembered_cellular_networks(); | 986 cros->remembered_cellular_networks(); |
987 for (chromeos::CellularNetworkVector::const_iterator it = | 987 for (chromeos::CellularNetworkVector::const_iterator it = |
988 cellular_networks.begin(); it != cellular_networks.end(); ++it) { | 988 cellular_networks.begin(); it != cellular_networks.end(); ++it) { |
989 SkBitmap icon = *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS0); | 989 SkBitmap icon = *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS0_BLACK); |
990 SkBitmap badge = *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_3G); | 990 SkBitmap badge = *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_3G); |
991 icon = chromeos::NetworkMenu::IconForDisplay(icon, badge); | 991 icon = chromeos::NetworkMenu::IconForDisplay(icon, badge); |
992 list->Append(GetNetwork( | 992 list->Append(GetNetwork( |
993 it->service_path(), | 993 it->service_path(), |
994 icon, | 994 icon, |
995 it->name(), | 995 it->name(), |
996 it->connecting(), | 996 it->connecting(), |
997 it->connected(), | 997 it->connected(), |
998 chromeos::TYPE_CELLULAR, | 998 chromeos::TYPE_CELLULAR, |
999 true, | 999 true, |
1000 it->activation_state())); | 1000 it->activation_state())); |
1001 } | 1001 } |
1002 | 1002 |
1003 return list; | 1003 return list; |
1004 } | 1004 } |
OLD | NEW |