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

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

Issue 2571043004: 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 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 base::HistogramBase* histogram = base::Histogram::FactoryTimeGet( 135 base::HistogramBase* histogram = base::Histogram::FactoryTimeGet(
136 histogram_name, 136 histogram_name,
137 base::TimeDelta::FromMilliseconds(10), 137 base::TimeDelta::FromMilliseconds(10),
138 base::TimeDelta::FromMinutes(3), 138 base::TimeDelta::FromMinutes(3),
139 50, 139 50,
140 base::HistogramBase::kUmaTargetedHistogramFlag); 140 base::HistogramBase::kUmaTargetedHistogramFlag);
141 histogram->AddTime(step_time); 141 histogram->AddTime(step_time);
142 } 142 }
143 143
144 bool IsRemoraRequisition() { 144 bool IsRemoraRequisition() {
145 return g_browser_process->platform_part() 145 policy::DeviceCloudPolicyManagerChromeOS* policy_manager =
146 ->browser_policy_connector_chromeos() 146 g_browser_process->platform_part()
147 ->GetDeviceCloudPolicyManager() 147 ->browser_policy_connector_chromeos()
148 ->IsRemoraRequisition(); 148 ->GetDeviceCloudPolicyManager();
149 return policy_manager && policy_manager->IsRemoraRequisition();
149 } 150 }
150 151
151 bool IsSharkRequisition() { 152 bool IsSharkRequisition() {
152 policy::DeviceCloudPolicyManagerChromeOS* policy_manager = 153 policy::DeviceCloudPolicyManagerChromeOS* policy_manager =
153 g_browser_process->platform_part() 154 g_browser_process->platform_part()
154 ->browser_policy_connector_chromeos() 155 ->browser_policy_connector_chromeos()
155 ->GetDeviceCloudPolicyManager(); 156 ->GetDeviceCloudPolicyManager();
156 return policy_manager && policy_manager->IsSharkRequisition(); 157 return policy_manager && policy_manager->IsSharkRequisition();
157 } 158 }
158 159
(...skipping 1341 matching lines...) Expand 10 before | Expand all | Expand 10 after
1500 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT; 1501 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT;
1501 } 1502 }
1502 1503
1503 EnrollmentScreen* screen = EnrollmentScreen::Get(this); 1504 EnrollmentScreen* screen = EnrollmentScreen::Get(this);
1504 screen->SetParameters(effective_config, shark_controller_.get()); 1505 screen->SetParameters(effective_config, shark_controller_.get());
1505 SetStatusAreaVisible(true); 1506 SetStatusAreaVisible(true);
1506 SetCurrentScreen(screen); 1507 SetCurrentScreen(screen);
1507 } 1508 }
1508 1509
1509 } // namespace chromeos 1510 } // 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