Chromium Code Reviews| 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 <stddef.h> | 8 #include <stddef.h> |
| 9 #include <stdlib.h> | 9 #include <stdlib.h> |
| 10 #include <sys/types.h> | 10 #include <sys/types.h> |
| (...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 149 chromeos::switches::kOobeBootstrappingSlave); | 149 chromeos::switches::kOobeBootstrappingSlave); |
| 150 } | 150 } |
| 151 | 151 |
| 152 // Checks if the device is a "Master" device in the bootstrapping process. | 152 // Checks if the device is a "Master" device in the bootstrapping process. |
| 153 bool IsBootstrappingMaster() { | 153 bool IsBootstrappingMaster() { |
| 154 return base::CommandLine::ForCurrentProcess()->HasSwitch( | 154 return base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 155 chromeos::switches::kOobeBootstrappingMaster); | 155 chromeos::switches::kOobeBootstrappingMaster); |
| 156 } | 156 } |
| 157 | 157 |
| 158 bool NetworkAllowUpdate(const chromeos::NetworkState* network) { | 158 bool NetworkAllowUpdate(const chromeos::NetworkState* network) { |
| 159 return false; // Force disable update. | |
|
xiyuan
2016/02/17 23:14:25
debugging code?
Alexander Alekseev
2016/02/18 13:45:14
Yes. this was for debugging only. Removed.
| |
| 159 if (!network || !network->IsConnectedState()) | 160 if (!network || !network->IsConnectedState()) |
| 160 return false; | 161 return false; |
| 161 if (network->type() == shill::kTypeBluetooth || | 162 if (network->type() == shill::kTypeBluetooth || |
| 162 (network->type() == shill::kTypeCellular && | 163 (network->type() == shill::kTypeCellular && |
| 163 !help_utils_chromeos::IsUpdateOverCellularAllowed())) { | 164 !help_utils_chromeos::IsUpdateOverCellularAllowed())) { |
| 164 return false; | 165 return false; |
| 165 } | 166 } |
| 166 return true; | 167 return true; |
| 167 } | 168 } |
| 168 | 169 |
| (...skipping 1208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1377 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT; | 1378 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT; |
| 1378 } | 1379 } |
| 1379 | 1380 |
| 1380 EnrollmentScreen* screen = EnrollmentScreen::Get(this); | 1381 EnrollmentScreen* screen = EnrollmentScreen::Get(this); |
| 1381 screen->SetParameters(effective_config, shark_controller_.get()); | 1382 screen->SetParameters(effective_config, shark_controller_.get()); |
| 1382 SetStatusAreaVisible(true); | 1383 SetStatusAreaVisible(true); |
| 1383 SetCurrentScreen(screen); | 1384 SetCurrentScreen(screen); |
| 1384 } | 1385 } |
| 1385 | 1386 |
| 1386 } // namespace chromeos | 1387 } // namespace chromeos |
| OLD | NEW |