Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(397)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/status/network_menu.cc

Issue 12779022: Add Ash notification UI for OutOfCredits network property (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add support for R26 Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/cros/network_library.cc ('k') | chrome/browser/chromeos/system/ash_system_tray_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/status/network_menu.cc
diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc
index 28d73654ed51bee5bc19c45643dd7052ebf981b4..9a7e36aa7a29ffd664643e765c75455bfaf9653c 100644
--- a/chrome/browser/chromeos/status/network_menu.cc
+++ b/chrome/browser/chromeos/status/network_menu.cc
@@ -981,7 +981,8 @@ void NetworkMenu::DoConnect(Network* network) {
}
} else if (network->type() == TYPE_CELLULAR) {
CellularNetwork* cellular = static_cast<CellularNetwork*>(network);
- if (cellular->activation_state() != ACTIVATION_STATE_ACTIVATED) {
+ if (cellular->activation_state() != ACTIVATION_STATE_ACTIVATED ||
+ cellular->out_of_credits()) {
ActivateCellular(cellular);
} else {
cros->ConnectToCellularNetwork(cellular);
@@ -1026,7 +1027,7 @@ void NetworkMenu::ConnectToNetwork(Network* network) {
case TYPE_CELLULAR: {
CellularNetwork* cell = static_cast<CellularNetwork*>(network);
- if (cell->NeedsActivation()) {
+ if (cell->NeedsActivation() || cell->out_of_credits()) {
ActivateCellular(cell);
} else if (cell->connecting_or_connected() ||
cell->activation_state() == ACTIVATION_STATE_ACTIVATING) {
« no previous file with comments | « chrome/browser/chromeos/cros/network_library.cc ('k') | chrome/browser/chromeos/system/ash_system_tray_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698