| 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/status/network_menu.h" | 5 #include "chrome/browser/chromeos/status/network_menu.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 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 550 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 561 if (!menu_items_.empty()) { // Don't add if first menu item. | 561 if (!menu_items_.empty()) { // Don't add if first menu item. |
| 562 menu_items_.push_back(MenuItem()); // Separator | 562 menu_items_.push_back(MenuItem()); // Separator |
| 563 } | 563 } |
| 564 } | 564 } |
| 565 | 565 |
| 566 SkBitmap icon = IconForNetworkStrength(wifi_networks[i]->strength(), | 566 SkBitmap icon = IconForNetworkStrength(wifi_networks[i]->strength(), |
| 567 true); | 567 true); |
| 568 SkBitmap badge = wifi_networks[i]->encrypted() ? | 568 SkBitmap badge = wifi_networks[i]->encrypted() ? |
| 569 *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_SECURE) : SkBitmap(); | 569 *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_SECURE) : SkBitmap(); |
| 570 int flag = FLAG_WIFI; | 570 int flag = FLAG_WIFI; |
| 571 if (!wifi_networks[i]->connectable()) |
| 572 flag |= FLAG_DISABLED; |
| 571 if (active_wifi | 573 if (active_wifi |
| 572 && wifi_networks[i]->service_path() == active_wifi->service_path()) | 574 && wifi_networks[i]->service_path() == active_wifi->service_path()) |
| 573 flag |= FLAG_ASSOCIATED; | 575 flag |= FLAG_ASSOCIATED; |
| 574 menu_items_.push_back( | 576 menu_items_.push_back( |
| 575 MenuItem(menus::MenuModel::TYPE_COMMAND, label, | 577 MenuItem(menus::MenuModel::TYPE_COMMAND, label, |
| 576 IconForDisplay(icon, badge), | 578 IconForDisplay(icon, badge), |
| 577 wifi_networks[i]->service_path(), flag)); | 579 wifi_networks[i]->service_path(), flag)); |
| 578 } | 580 } |
| 579 } | 581 } |
| 580 | 582 |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 619 separator_added = true; | 621 separator_added = true; |
| 620 if (!menu_items_.empty()) { // Don't add if first menu item. | 622 if (!menu_items_.empty()) { // Don't add if first menu item. |
| 621 menu_items_.push_back(MenuItem()); // Separator | 623 menu_items_.push_back(MenuItem()); // Separator |
| 622 } | 624 } |
| 623 } | 625 } |
| 624 | 626 |
| 625 SkBitmap icon = IconForNetworkStrength(cell_networks[i]->strength(), | 627 SkBitmap icon = IconForNetworkStrength(cell_networks[i]->strength(), |
| 626 true); | 628 true); |
| 627 SkBitmap badge = BadgeForNetworkTechnology(cell_networks[i]); | 629 SkBitmap badge = BadgeForNetworkTechnology(cell_networks[i]); |
| 628 int flag = FLAG_CELLULAR; | 630 int flag = FLAG_CELLULAR; |
| 631 if (!cell_networks[i]->connectable()) |
| 632 flag |= FLAG_DISABLED; |
| 629 bool isActive = active_cellular && | 633 bool isActive = active_cellular && |
| 630 cell_networks[i]->service_path() == active_cellular->service_path() && | 634 cell_networks[i]->service_path() == active_cellular->service_path() && |
| 631 (cell_networks[i]->connecting() || cell_networks[i]->connected()); | 635 (cell_networks[i]->connecting() || cell_networks[i]->connected()); |
| 632 if (isActive) | 636 if (isActive) |
| 633 flag |= FLAG_ASSOCIATED; | 637 flag |= FLAG_ASSOCIATED; |
| 634 menu_items_.push_back( | 638 menu_items_.push_back( |
| 635 MenuItem(menus::MenuModel::TYPE_COMMAND, label, | 639 MenuItem(menus::MenuModel::TYPE_COMMAND, label, |
| 636 IconForDisplay(icon, badge), | 640 IconForDisplay(icon, badge), |
| 637 cell_networks[i]->service_path(), flag)); | 641 cell_networks[i]->service_path(), flag)); |
| 638 if (isActive) { | 642 if (isActive) { |
| (...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 803 chromeos::TYPE_WIFI); | 807 chromeos::TYPE_WIFI); |
| 804 browser->ShowOptionsTab(page); | 808 browser->ShowOptionsTab(page); |
| 805 } | 809 } |
| 806 } else { | 810 } else { |
| 807 const bool kFocusLogin = true; | 811 const bool kFocusLogin = true; |
| 808 ShowNetworkConfigView(new NetworkConfigView(), kFocusLogin); | 812 ShowNetworkConfigView(new NetworkConfigView(), kFocusLogin); |
| 809 } | 813 } |
| 810 } | 814 } |
| 811 | 815 |
| 812 } // namespace chromeos | 816 } // namespace chromeos |
| OLD | NEW |