| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/status/network_menu.h" | 5 #include "chrome/browser/chromeos/status/network_menu.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 | 10 |
| (...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 452 menu_items_.push_back( | 452 menu_items_.push_back( |
| 453 MenuItem(ui::MenuModel::TYPE_COMMAND, | 453 MenuItem(ui::MenuModel::TYPE_COMMAND, |
| 454 label, icon, network->path(), flag)); | 454 label, icon, network->path(), flag)); |
| 455 } | 455 } |
| 456 | 456 |
| 457 // For GSM add cellular network scan. | 457 // For GSM add cellular network scan. |
| 458 const DeviceState* cellular_device = | 458 const DeviceState* cellular_device = |
| 459 handler->GetDeviceStateByType(NetworkTypePattern::Cellular()); | 459 handler->GetDeviceStateByType(NetworkTypePattern::Cellular()); |
| 460 if (cellular_device && cellular_device->support_network_scan()) { | 460 if (cellular_device && cellular_device->support_network_scan()) { |
| 461 const gfx::ImageSkia icon = | 461 const gfx::ImageSkia icon = |
| 462 ui::network_icon::GetImageForDisconnectedNetwork( | 462 ui::network_icon::GetImageForDisconnectedCellNetwork(); |
| 463 ui::network_icon::ICON_TYPE_LIST, shill::kTypeCellular); | |
| 464 menu_items_.push_back(MenuItem( | 463 menu_items_.push_back(MenuItem( |
| 465 ui::MenuModel::TYPE_COMMAND, | 464 ui::MenuModel::TYPE_COMMAND, |
| 466 l10n_util::GetStringUTF16( | 465 l10n_util::GetStringUTF16( |
| 467 IDS_OPTIONS_SETTINGS_OTHER_CELLULAR_NETWORKS), | 466 IDS_OPTIONS_SETTINGS_OTHER_CELLULAR_NETWORKS), |
| 468 icon, std::string(), FLAG_ADD_CELLULAR)); | 467 icon, std::string(), FLAG_ADD_CELLULAR)); |
| 469 } | 468 } |
| 470 } else { | 469 } else { |
| 471 int initializing_message_id = | 470 int initializing_message_id = |
| 472 ui::network_icon::GetCellularUninitializedMsg(); | 471 ui::network_icon::GetCellularUninitializedMsg(); |
| 473 if (initializing_message_id) { | 472 if (initializing_message_id) { |
| (...skipping 27 matching lines...) Expand all Loading... |
| 501 continue; | 500 continue; |
| 502 // Add 'Searching for Wi-Fi networks...' after connected networks. | 501 // Add 'Searching for Wi-Fi networks...' after connected networks. |
| 503 if (scanning_msg && !network->IsConnectedState()) { | 502 if (scanning_msg && !network->IsConnectedState()) { |
| 504 AddMessageItem(l10n_util::GetStringUTF16(scanning_msg)); | 503 AddMessageItem(l10n_util::GetStringUTF16(scanning_msg)); |
| 505 scanning_msg = 0; | 504 scanning_msg = 0; |
| 506 } | 505 } |
| 507 AddWirelessNetworkMenuItem(network, FLAG_WIFI); | 506 AddWirelessNetworkMenuItem(network, FLAG_WIFI); |
| 508 } | 507 } |
| 509 if (scanning_msg) | 508 if (scanning_msg) |
| 510 AddMessageItem(l10n_util::GetStringUTF16(scanning_msg)); | 509 AddMessageItem(l10n_util::GetStringUTF16(scanning_msg)); |
| 511 const gfx::ImageSkia icon = ui::network_icon::GetImageForConnectedNetwork( | 510 const gfx::ImageSkia icon = |
| 512 ui::network_icon::ICON_TYPE_LIST, shill::kTypeWifi); | 511 ui::network_icon::GetImageForConnectedWifiNetwork(); |
| 513 menu_items_.push_back(MenuItem( | 512 menu_items_.push_back(MenuItem( |
| 514 ui::MenuModel::TYPE_COMMAND, | 513 ui::MenuModel::TYPE_COMMAND, |
| 515 l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_OTHER_WIFI_NETWORKS), | 514 l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_OTHER_WIFI_NETWORKS), |
| 516 icon, std::string(), FLAG_ADD_WIFI)); | 515 icon, std::string(), FLAG_ADD_WIFI)); |
| 517 } | 516 } |
| 518 | 517 |
| 519 if (menu_items_.empty()) { | 518 if (menu_items_.empty()) { |
| 520 // No networks available (and not initializing cellular or wifi scanning) | 519 // No networks available (and not initializing cellular or wifi scanning) |
| 521 AddMessageItem(l10n_util::GetStringFUTF16( | 520 AddMessageItem(l10n_util::GetStringFUTF16( |
| 522 IDS_STATUSBAR_NETWORK_MENU_ITEM_INDENT, | 521 IDS_STATUSBAR_NETWORK_MENU_ITEM_INDENT, |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 674 return main_menu_model_.get(); | 673 return main_menu_model_.get(); |
| 675 } | 674 } |
| 676 | 675 |
| 677 void NetworkMenu::UpdateMenu() { | 676 void NetworkMenu::UpdateMenu() { |
| 678 refreshing_menu_ = true; | 677 refreshing_menu_ = true; |
| 679 main_menu_model_->InitMenuItems(delegate_->ShouldOpenButtonOptions()); | 678 main_menu_model_->InitMenuItems(delegate_->ShouldOpenButtonOptions()); |
| 680 refreshing_menu_ = false; | 679 refreshing_menu_ = false; |
| 681 } | 680 } |
| 682 | 681 |
| 683 } // namespace chromeos | 682 } // namespace chromeos |
| OLD | NEW |