OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
411 if (cellular->network_technology() == NETWORK_TECHNOLOGY_EVDO) { | 411 if (cellular->network_technology() == NETWORK_TECHNOLOGY_EVDO) { |
412 switch (cellular->GetDataLeft()) { | 412 switch (cellular->GetDataLeft()) { |
413 case CellularNetwork::DATA_NONE: | 413 case CellularNetwork::DATA_NONE: |
414 id = IDR_STATUSBAR_NETWORK_3G_ERROR; | 414 id = IDR_STATUSBAR_NETWORK_3G_ERROR; |
415 break; | 415 break; |
416 case CellularNetwork::DATA_VERY_LOW: | 416 case CellularNetwork::DATA_VERY_LOW: |
417 case CellularNetwork::DATA_LOW: | 417 case CellularNetwork::DATA_LOW: |
418 case CellularNetwork::DATA_NORMAL: | 418 case CellularNetwork::DATA_NORMAL: |
419 id = IDR_STATUSBAR_NETWORK_3G; | 419 id = IDR_STATUSBAR_NETWORK_3G; |
420 break; | 420 break; |
| 421 case CellularNetwork::DATA_UNKNOWN: |
| 422 id = IDR_STATUSBAR_NETWORK_3G_UNKNOWN; |
| 423 break; |
421 } | 424 } |
422 } else if (cellular->network_technology() == NETWORK_TECHNOLOGY_1XRTT) { | 425 } else if (cellular->network_technology() == NETWORK_TECHNOLOGY_1XRTT) { |
423 switch (cellular->GetDataLeft()) { | 426 switch (cellular->GetDataLeft()) { |
424 case CellularNetwork::DATA_NONE: | 427 case CellularNetwork::DATA_NONE: |
425 id = IDR_STATUSBAR_NETWORK_1X_ERROR; | 428 id = IDR_STATUSBAR_NETWORK_1X_ERROR; |
426 break; | 429 break; |
427 case CellularNetwork::DATA_VERY_LOW: | 430 case CellularNetwork::DATA_VERY_LOW: |
428 case CellularNetwork::DATA_LOW: | 431 case CellularNetwork::DATA_LOW: |
429 case CellularNetwork::DATA_NORMAL: | 432 case CellularNetwork::DATA_NORMAL: |
430 id = IDR_STATUSBAR_NETWORK_1X; | 433 id = IDR_STATUSBAR_NETWORK_1X; |
431 break; | 434 break; |
| 435 case CellularNetwork::DATA_UNKNOWN: |
| 436 id = IDR_STATUSBAR_NETWORK_1X_UNKNOWN; |
| 437 break; |
432 } | 438 } |
433 } | 439 } |
434 if (id == -1) | 440 if (id == -1) |
435 return SkBitmap(); | 441 return SkBitmap(); |
436 else | 442 else |
437 return *ResourceBundle::GetSharedInstance().GetBitmapNamed(id); | 443 return *ResourceBundle::GetSharedInstance().GetBitmapNamed(id); |
438 } | 444 } |
439 | 445 |
440 // static | 446 // static |
441 SkBitmap NetworkMenu::IconForDisplay(SkBitmap icon, SkBitmap badge) { | 447 SkBitmap NetworkMenu::IconForDisplay(SkBitmap icon, SkBitmap badge) { |
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
749 chrome::kInternetOptionsSubPage, | 755 chrome::kInternetOptionsSubPage, |
750 chromeos::TYPE_WIFI); | 756 chromeos::TYPE_WIFI); |
751 browser->ShowOptionsTab(page); | 757 browser->ShowOptionsTab(page); |
752 } | 758 } |
753 } else { | 759 } else { |
754 ShowNetworkConfigView(new NetworkConfigView()); | 760 ShowNetworkConfigView(new NetworkConfigView()); |
755 } | 761 } |
756 } | 762 } |
757 | 763 |
758 } // namespace chromeos | 764 } // namespace chromeos |
OLD | NEW |