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/login/wizard_controller.h" | 5 #include "chrome/browser/chromeos/login/wizard_controller.h" |
6 | 6 |
7 #include <signal.h> | 7 #include <signal.h> |
8 #include <stdlib.h> | 8 #include <stdlib.h> |
9 #include <sys/types.h> | 9 #include <sys/types.h> |
10 | 10 |
(...skipping 1223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1234 if (elapsed >= timeout) { | 1234 if (elapsed >= timeout) { |
1235 LOG(WARNING) << "Resolve TimeZone: got location after timeout (" | 1235 LOG(WARNING) << "Resolve TimeZone: got location after timeout (" |
1236 << elapsed.InSecondsF() << " seconds elapsed). Ignored."; | 1236 << elapsed.InSecondsF() << " seconds elapsed). Ignored."; |
1237 return; | 1237 return; |
1238 } | 1238 } |
1239 | 1239 |
1240 // WizardController owns TimezoneProvider, so timezone request is silently | 1240 // WizardController owns TimezoneProvider, so timezone request is silently |
1241 // cancelled on destruction. | 1241 // cancelled on destruction. |
1242 GetTimezoneProvider()->RequestTimezone( | 1242 GetTimezoneProvider()->RequestTimezone( |
1243 position, | 1243 position, |
1244 false, // sensor | |
1245 timeout - elapsed, | 1244 timeout - elapsed, |
1246 base::Bind(&WizardController::OnTimezoneResolved, | 1245 base::Bind(&WizardController::OnTimezoneResolved, |
1247 base::Unretained(this))); | 1246 base::Unretained(this))); |
1248 } | 1247 } |
1249 | 1248 |
1250 bool WizardController::SetOnTimeZoneResolvedForTesting( | 1249 bool WizardController::SetOnTimeZoneResolvedForTesting( |
1251 const base::Closure& callback) { | 1250 const base::Closure& callback) { |
1252 if (timezone_resolved_) | 1251 if (timezone_resolved_) |
1253 return false; | 1252 return false; |
1254 | 1253 |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1303 } | 1302 } |
1304 | 1303 |
1305 EnrollmentScreen* screen = EnrollmentScreen::Get(this); | 1304 EnrollmentScreen* screen = EnrollmentScreen::Get(this); |
1306 screen->SetParameters(effective_config, shark_controller_.get(), | 1305 screen->SetParameters(effective_config, shark_controller_.get(), |
1307 remora_controller_.get()); | 1306 remora_controller_.get()); |
1308 SetStatusAreaVisible(true); | 1307 SetStatusAreaVisible(true); |
1309 SetCurrentScreen(screen); | 1308 SetCurrentScreen(screen); |
1310 } | 1309 } |
1311 | 1310 |
1312 } // namespace chromeos | 1311 } // namespace chromeos |
OLD | NEW |