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/mobile/mobile_activator.h" | 5 #include "chrome/browser/chromeos/mobile/mobile_activator.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <map> | 8 #include <map> |
9 #include <string> | 9 #include <string> |
10 | 10 |
(...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
547 } else { | 547 } else { |
548 LOG(ERROR) << "OTASP timed out from a non-OTASP wait state?"; | 548 LOG(ERROR) << "OTASP timed out from a non-OTASP wait state?"; |
549 } | 549 } |
550 LOG(ERROR) << "OTASP failed too many times; aborting."; | 550 LOG(ERROR) << "OTASP failed too many times; aborting."; |
551 ChangeState(network, | 551 ChangeState(network, |
552 PLAN_ACTIVATION_ERROR, | 552 PLAN_ACTIVATION_ERROR, |
553 GetErrorMessage(kErrorDefault)); | 553 GetErrorMessage(kErrorDefault)); |
554 } | 554 } |
555 | 555 |
556 void MobileActivator::ConnectNetwork(const NetworkState* network) { | 556 void MobileActivator::ConnectNetwork(const NetworkState* network) { |
| 557 LOG(ERROR) << "*** QUICHE: " << __func__; |
557 NetworkHandler::Get()->network_connection_handler()->ConnectToNetwork( | 558 NetworkHandler::Get()->network_connection_handler()->ConnectToNetwork( |
558 network->path(), | 559 network->path(), |
559 base::Bind(&base::DoNothing), | 560 base::Bind(&base::DoNothing), |
560 network_handler::ErrorCallback(), | 561 network_handler::ErrorCallback(), |
561 false /* check_error_state */); | 562 false /* check_error_state */); |
562 } | 563 } |
563 | 564 |
564 void MobileActivator::ForceReconnect(const NetworkState* network, | 565 void MobileActivator::ForceReconnect(const NetworkState* network, |
565 PlanActivationState next_state) { | 566 PlanActivationState next_state) { |
566 DCHECK(network); | 567 DCHECK(network); |
(...skipping 596 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1163 cellular_plan_payment_time_ = base::Time::Now(); | 1164 cellular_plan_payment_time_ = base::Time::Now(); |
1164 } | 1165 } |
1165 | 1166 |
1166 bool MobileActivator::HasRecentCellularPlanPayment() const { | 1167 bool MobileActivator::HasRecentCellularPlanPayment() const { |
1167 const int kRecentPlanPaymentHours = 6; | 1168 const int kRecentPlanPaymentHours = 6; |
1168 return (base::Time::Now() - | 1169 return (base::Time::Now() - |
1169 cellular_plan_payment_time_).InHours() < kRecentPlanPaymentHours; | 1170 cellular_plan_payment_time_).InHours() < kRecentPlanPaymentHours; |
1170 } | 1171 } |
1171 | 1172 |
1172 } // namespace chromeos | 1173 } // namespace chromeos |
OLD | NEW |