Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(72)

Side by Side Diff: chrome/browser/chromeos/login/wizard_controller.cc

Issue 711433002: Enable device disabling during normal operation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@f_4_425574_add_device_disabling_manager
Patch Set: Address one more comment I had missed. Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1101 matching lines...) Expand 10 before | Expand all | Expand 10 after
1112 1112
1113 if (status == CrosSettingsProvider::PERMANENTLY_UNTRUSTED) { 1113 if (status == CrosSettingsProvider::PERMANENTLY_UNTRUSTED) {
1114 // If the |cros_settings_| are permanently untrusted, show an error message 1114 // If the |cros_settings_| are permanently untrusted, show an error message
1115 // and refuse to auto-launch the kiosk app. 1115 // and refuse to auto-launch the kiosk app.
1116 GetErrorScreen()->SetUIState(ErrorScreen::UI_STATE_LOCAL_STATE_ERROR); 1116 GetErrorScreen()->SetUIState(ErrorScreen::UI_STATE_LOCAL_STATE_ERROR);
1117 SetStatusAreaVisible(false); 1117 SetStatusAreaVisible(false);
1118 ShowErrorScreen(); 1118 ShowErrorScreen();
1119 return; 1119 return;
1120 } 1120 }
1121 1121
1122 bool device_disabled = false;
1123 CrosSettings::Get()->GetBoolean(kDeviceDisabled, &device_disabled);
1124 if (device_disabled && system::DeviceDisablingManager::
1125 HonorDeviceDisablingDuringNormalOperation()) {
1126 // If the device is disabled, bail out. A device disabled screen will be
1127 // shown by the DeviceDisablingManager.
1128 return;
1129 }
1130
1122 host_->StartAppLaunch(app_id, false /* diagnostic_mode */); 1131 host_->StartAppLaunch(app_id, false /* diagnostic_mode */);
1123 } 1132 }
1124 1133
1125 // static 1134 // static
1126 void WizardController::SetZeroDelays() { 1135 void WizardController::SetZeroDelays() {
1127 kShowDelayMs = 0; 1136 kShowDelayMs = 0;
1128 zero_delay_enabled_ = true; 1137 zero_delay_enabled_ = true;
1129 } 1138 }
1130 1139
1131 // static 1140 // static
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
1324 scoped_ptr<pairing_chromeos::HostPairingController> remora_controller) { 1333 scoped_ptr<pairing_chromeos::HostPairingController> remora_controller) {
1325 VLOG(1) << "OnSharkConnected"; 1334 VLOG(1) << "OnSharkConnected";
1326 remora_controller_ = remora_controller.Pass(); 1335 remora_controller_ = remora_controller.Pass();
1327 base::MessageLoop::current()->DeleteSoon( 1336 base::MessageLoop::current()->DeleteSoon(
1328 FROM_HERE, shark_connection_listener_.release()); 1337 FROM_HERE, shark_connection_listener_.release());
1329 shark_controller_detected_ = true; 1338 shark_controller_detected_ = true;
1330 ShowHostPairingScreen(); 1339 ShowHostPairingScreen();
1331 } 1340 }
1332 1341
1333 } // namespace chromeos 1342 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698