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

Side by Side Diff: chrome/browser/chromeos/settings/install_attributes.h

Issue 2534433002: Mop up incorrect uses of IsEnterpriseManaged() (Closed)
Patch Set: Address Roman's comment 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 | « chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc ('k') | 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 #ifndef CHROME_BROWSER_CHROMEOS_SETTINGS_INSTALL_ATTRIBUTES_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_SETTINGS_INSTALL_ATTRIBUTES_H_
6 #define CHROME_BROWSER_CHROMEOS_SETTINGS_INSTALL_ATTRIBUTES_H_ 6 #define CHROME_BROWSER_CHROMEOS_SETTINGS_INSTALL_ATTRIBUTES_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 // called while a previous LockDevice() invocation is still pending. 70 // called while a previous LockDevice() invocation is still pending.
71 void LockDevice(policy::DeviceMode device_mode, 71 void LockDevice(policy::DeviceMode device_mode,
72 const std::string& domain, 72 const std::string& domain,
73 const std::string& realm, 73 const std::string& realm,
74 const std::string& device_id, 74 const std::string& device_id,
75 const LockResultCallback& callback); 75 const LockResultCallback& callback);
76 76
77 // Checks whether this devices is under any kind of enterprise management. 77 // Checks whether this devices is under any kind of enterprise management.
78 bool IsEnterpriseManaged() const; 78 bool IsEnterpriseManaged() const;
79 79
80 // Checks whether this is a cloud managed enterprise device. 80 // Checks whether this is a cloud (DM server) managed enterprise device.
81 bool IsCloudManaged() const; 81 bool IsCloudManaged() const;
82 82
83 // Checks whether this is an Active Directory managed enterprise device. 83 // Checks whether this is an Active Directory managed enterprise device.
84 bool IsActiveDirectoryManaged() const; 84 bool IsActiveDirectoryManaged() const;
85 85
86 // Checks whether this is a consumer kiosk enabled device. 86 // Checks whether this is a consumer kiosk enabled device.
87 bool IsConsumerKioskDeviceWithAutoLaunch(); 87 bool IsConsumerKioskDeviceWithAutoLaunch();
88 88
89 // Return the mode the device was enrolled to. The return value for devices 89 // Return the mode the device was enrolled to. The return value for devices
90 // that are not locked yet is DEVICE_MODE_UNKNOWN. 90 // that are not locked yet is DEVICE_MODE_UNKNOWN.
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 CryptohomeClient* cryptohome_client_; 200 CryptohomeClient* cryptohome_client_;
201 201
202 base::WeakPtrFactory<InstallAttributes> weak_ptr_factory_; 202 base::WeakPtrFactory<InstallAttributes> weak_ptr_factory_;
203 203
204 DISALLOW_COPY_AND_ASSIGN(InstallAttributes); 204 DISALLOW_COPY_AND_ASSIGN(InstallAttributes);
205 }; 205 };
206 206
207 } // namespace chromeos 207 } // namespace chromeos
208 208
209 #endif // CHROME_BROWSER_CHROMEOS_SETTINGS_INSTALL_ATTRIBUTES_H_ 209 #endif // CHROME_BROWSER_CHROMEOS_SETTINGS_INSTALL_ATTRIBUTES_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698