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

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

Issue 2530193002: Fix crash in WizardController for Active Directory devices (Closed)
Patch Set: Created 4 years 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <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 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 } 142 }
143 143
144 bool IsRemoraRequisition() { 144 bool IsRemoraRequisition() {
145 return g_browser_process->platform_part() 145 return g_browser_process->platform_part()
146 ->browser_policy_connector_chromeos() 146 ->browser_policy_connector_chromeos()
147 ->GetDeviceCloudPolicyManager() 147 ->GetDeviceCloudPolicyManager()
148 ->IsRemoraRequisition(); 148 ->IsRemoraRequisition();
149 } 149 }
150 150
151 bool IsSharkRequisition() { 151 bool IsSharkRequisition() {
152 return g_browser_process->platform_part() 152 policy::DeviceCloudPolicyManagerChromeOS* policy_manager =
153 ->browser_policy_connector_chromeos() 153 g_browser_process->platform_part()
154 ->GetDeviceCloudPolicyManager() 154 ->browser_policy_connector_chromeos()
155 ->IsSharkRequisition(); 155 ->GetDeviceCloudPolicyManager();
156 return policy_manager && policy_manager->IsSharkRequisition();
156 } 157 }
157 158
158 // Checks if a controller device ("Master") is detected during the bootstrapping 159 // Checks if a controller device ("Master") is detected during the bootstrapping
159 // or shark/remora setup process. 160 // or shark/remora setup process.
160 bool IsControllerDetected() { 161 bool IsControllerDetected() {
161 return g_browser_process->local_state()->GetBoolean( 162 return g_browser_process->local_state()->GetBoolean(
162 prefs::kOobeControllerDetected); 163 prefs::kOobeControllerDetected);
163 } 164 }
164 165
165 void SetControllerDetectedPref(bool value) { 166 void SetControllerDetectedPref(bool value) {
(...skipping 1333 matching lines...) Expand 10 before | Expand all | Expand 10 after
1499 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT; 1500 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT;
1500 } 1501 }
1501 1502
1502 EnrollmentScreen* screen = EnrollmentScreen::Get(this); 1503 EnrollmentScreen* screen = EnrollmentScreen::Get(this);
1503 screen->SetParameters(effective_config, shark_controller_.get()); 1504 screen->SetParameters(effective_config, shark_controller_.get());
1504 SetStatusAreaVisible(true); 1505 SetStatusAreaVisible(true);
1505 SetCurrentScreen(screen); 1506 SetCurrentScreen(screen);
1506 } 1507 }
1507 1508
1508 } // namespace chromeos 1509 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698