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

Unified Diff: chrome/browser/chromeos/mobile/mobile_activator.cc

Issue 10913209: chromeos: Fix eternal cellular activation spinner (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: nochange Created 8 years, 3 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/mobile/mobile_activator.cc
diff --git a/chrome/browser/chromeos/mobile/mobile_activator.cc b/chrome/browser/chromeos/mobile/mobile_activator.cc
index 476bd37b0396c3965dce7a26db913aad118a2b1c..78c68ce81dc9bfce4d558f9d3999a6b45e9b5369 100644
--- a/chrome/browser/chromeos/mobile/mobile_activator.cc
+++ b/chrome/browser/chromeos/mobile/mobile_activator.cc
@@ -460,13 +460,10 @@ bool MobileActivator::ConnectToNetwork(CellularNetwork* network, int delay) {
state_ != PLAN_ACTIVATION_RECONNECTING &&
state_ != PLAN_ACTIVATION_RECONNECTING_PAYMENT &&
state_ != PLAN_ACTIVATION_RECONNECTING_OTASP) return false;
- if (network)
- LOG(INFO) << "Connecting to: " << network->service_path();
connection_retry_count_++;
connection_start_time_ = base::Time::Now();
- if (!network || state_ == PLAN_ACTIVATION_RECONNECTING_OTASP) {
- LOG(WARNING) << "Delaying reconnect to "
- << (network ? network->service_path().c_str() : "no service");
+ if (!network) {
+ LOG(WARNING) << "Connect failed, will try again in a little bit.";
// If we coudn't connect during reconnection phase, try to reconnect
// with a delay (and try to reconnect if needed).
BrowserThread::PostDelayedTask(BrowserThread::UI, FROM_HERE,
@@ -474,6 +471,7 @@ bool MobileActivator::ConnectToNetwork(CellularNetwork* network, int delay) {
base::TimeDelta::FromMilliseconds(delay));
return false;
}
+ LOG(INFO) << "Connecting to: " << network->service_path();
CrosLibrary::Get()->GetNetworkLibrary()->
ConnectToCellularNetwork(network);
return true;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698