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 1157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1168 | 1168 |
1169 PrefService* WizardController::GetLocalState() { | 1169 PrefService* WizardController::GetLocalState() { |
1170 if (local_state_for_testing_) | 1170 if (local_state_for_testing_) |
1171 return local_state_for_testing_; | 1171 return local_state_for_testing_; |
1172 return g_browser_process->local_state(); | 1172 return g_browser_process->local_state(); |
1173 } | 1173 } |
1174 | 1174 |
1175 void WizardController::OnTimezoneResolved( | 1175 void WizardController::OnTimezoneResolved( |
1176 scoped_ptr<TimeZoneResponseData> timezone, | 1176 scoped_ptr<TimeZoneResponseData> timezone, |
1177 bool server_error) { | 1177 bool server_error) { |
1178 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 1178 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
1179 DCHECK(timezone.get()); | 1179 DCHECK(timezone.get()); |
1180 // To check that "this" is not destroyed try to access some member | 1180 // To check that "this" is not destroyed try to access some member |
1181 // (timezone_provider_) in this case. Expect crash here. | 1181 // (timezone_provider_) in this case. Expect crash here. |
1182 DCHECK(timezone_provider_.get()); | 1182 DCHECK(timezone_provider_.get()); |
1183 | 1183 |
1184 timezone_resolved_ = true; | 1184 timezone_resolved_ = true; |
1185 base::ScopedClosureRunner inform_test(on_timezone_resolved_for_testing_); | 1185 base::ScopedClosureRunner inform_test(on_timezone_resolved_for_testing_); |
1186 on_timezone_resolved_for_testing_.Reset(); | 1186 on_timezone_resolved_for_testing_.Reset(); |
1187 | 1187 |
1188 VLOG(1) << "Resolved local timezone={" << timezone->ToStringForDebug() | 1188 VLOG(1) << "Resolved local timezone={" << timezone->ToStringForDebug() |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1220 timezone_provider_.reset( | 1220 timezone_provider_.reset( |
1221 new TimeZoneProvider(g_browser_process->system_request_context(), | 1221 new TimeZoneProvider(g_browser_process->system_request_context(), |
1222 DefaultTimezoneProviderURL())); | 1222 DefaultTimezoneProviderURL())); |
1223 } | 1223 } |
1224 return timezone_provider_.get(); | 1224 return timezone_provider_.get(); |
1225 } | 1225 } |
1226 | 1226 |
1227 void WizardController::OnLocationResolved(const Geoposition& position, | 1227 void WizardController::OnLocationResolved(const Geoposition& position, |
1228 bool server_error, | 1228 bool server_error, |
1229 const base::TimeDelta elapsed) { | 1229 const base::TimeDelta elapsed) { |
1230 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 1230 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
1231 | 1231 |
1232 const base::TimeDelta timeout = | 1232 const base::TimeDelta timeout = |
1233 base::TimeDelta::FromSeconds(kResolveTimeZoneTimeoutSeconds); | 1233 base::TimeDelta::FromSeconds(kResolveTimeZoneTimeoutSeconds); |
1234 // Ignore invalid position. | 1234 // Ignore invalid position. |
1235 if (!position.Valid()) | 1235 if (!position.Valid()) |
1236 return; | 1236 return; |
1237 | 1237 |
1238 if (elapsed >= timeout) { | 1238 if (elapsed >= timeout) { |
1239 LOG(WARNING) << "Resolve TimeZone: got location after timeout (" | 1239 LOG(WARNING) << "Resolve TimeZone: got location after timeout (" |
1240 << elapsed.InSecondsF() << " seconds elapsed). Ignored."; | 1240 << elapsed.InSecondsF() << " seconds elapsed). Ignored."; |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1306 } | 1306 } |
1307 | 1307 |
1308 EnrollmentScreen* screen = EnrollmentScreen::Get(this); | 1308 EnrollmentScreen* screen = EnrollmentScreen::Get(this); |
1309 screen->SetParameters(effective_config, shark_controller_.get(), | 1309 screen->SetParameters(effective_config, shark_controller_.get(), |
1310 remora_controller_.get()); | 1310 remora_controller_.get()); |
1311 SetStatusAreaVisible(true); | 1311 SetStatusAreaVisible(true); |
1312 SetCurrentScreen(screen); | 1312 SetCurrentScreen(screen); |
1313 } | 1313 } |
1314 | 1314 |
1315 } // namespace chromeos | 1315 } // namespace chromeos |
OLD | NEW |