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 1028 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1039 } | 1039 } |
1040 | 1040 |
1041 void WizardController::SetUsageStatisticsReporting(bool val) { | 1041 void WizardController::SetUsageStatisticsReporting(bool val) { |
1042 usage_statistics_reporting_ = val; | 1042 usage_statistics_reporting_ = val; |
1043 } | 1043 } |
1044 | 1044 |
1045 bool WizardController::GetUsageStatisticsReporting() const { | 1045 bool WizardController::GetUsageStatisticsReporting() const { |
1046 return usage_statistics_reporting_; | 1046 return usage_statistics_reporting_; |
1047 } | 1047 } |
1048 | 1048 |
1049 void WizardController::SetHostNetwork() { | |
1050 if (shark_controller_) { | |
stevenjb
2015/11/05 23:48:25
if (!shark_controller_)
return;
xdai1
2015/11/06 23:23:02
Done.
| |
1051 NetworkScreen* network_screen = NetworkScreen::Get(this); | |
1052 const std::string onc_spec = network_screen->GetConnectedWifiNetwork(); | |
1053 if (!onc_spec.empty()) | |
1054 shark_controller_->SetHostNetwork(onc_spec); | |
1055 } | |
1056 } | |
1057 | |
1049 void WizardController::SetHostConfiguration() { | 1058 void WizardController::SetHostConfiguration() { |
1050 if (shark_controller_) { | 1059 if (shark_controller_) { |
1051 NetworkScreen* network_screen = NetworkScreen::Get(this); | 1060 NetworkScreen* network_screen = NetworkScreen::Get(this); |
1052 shark_controller_->SetHostConfiguration( | 1061 shark_controller_->SetHostConfiguration( |
1053 true, // Eula must be accepted before we get this far. | 1062 true, // Eula must be accepted before we get this far. |
1054 network_screen->GetApplicationLocale(), network_screen->GetTimezone(), | 1063 network_screen->GetApplicationLocale(), network_screen->GetTimezone(), |
1055 GetUsageStatisticsReporting(), network_screen->GetInputMethod()); | 1064 GetUsageStatisticsReporting(), network_screen->GetInputMethod()); |
1056 } | 1065 } |
1057 } | 1066 } |
1058 | 1067 |
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1317 } | 1326 } |
1318 | 1327 |
1319 EnrollmentScreen* screen = EnrollmentScreen::Get(this); | 1328 EnrollmentScreen* screen = EnrollmentScreen::Get(this); |
1320 screen->SetParameters(effective_config, shark_controller_.get(), | 1329 screen->SetParameters(effective_config, shark_controller_.get(), |
1321 remora_controller_.get()); | 1330 remora_controller_.get()); |
1322 SetStatusAreaVisible(true); | 1331 SetStatusAreaVisible(true); |
1323 SetCurrentScreen(screen); | 1332 SetCurrentScreen(screen); |
1324 } | 1333 } |
1325 | 1334 |
1326 } // namespace chromeos | 1335 } // namespace chromeos |
OLD | NEW |